diff options
author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-08-18 13:33:43 -0700 |
---|---|---|
committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-08-18 13:33:43 -0700 |
commit | 14df7aa3c937ed8907bd7e9b2657526233691803 (patch) | |
tree | 77e876ba2739e7fe396e93b8fd908df845d60d51 /lib/Vyatta/Keepalived.pm | |
parent | abc2986d38f4b6f7a7ccc0fd3fb10e4f21652209 (diff) | |
parent | 3594ffa9f1c62d5f73d12b35f81a862c762b5d44 (diff) | |
download | vyatta-cfg-14df7aa3c937ed8907bd7e9b2657526233691803.tar.gz vyatta-cfg-14df7aa3c937ed8907bd7e9b2657526233691803.zip |
Merge branch 'mendocino' of suva.vyatta.com:/git/vyatta-cfg into mendocino
Diffstat (limited to 'lib/Vyatta/Keepalived.pm')
-rwxr-xr-x | lib/Vyatta/Keepalived.pm | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/Vyatta/Keepalived.pm b/lib/Vyatta/Keepalived.pm index dc7e71b..3d8fe24 100755 --- a/lib/Vyatta/Keepalived.pm +++ b/lib/Vyatta/Keepalived.pm @@ -320,11 +320,7 @@ sub list_vrrp_intf { my $path = $intf->path(); $config->setLevel($path); if (defined $val_func) { - if ($val_func eq 'isActive') { - push @intfs, $name if $config->$val_func("vrrp") == 0; - } else { - push @intfs, $name if $config->$val_func("vrrp"); - } + push @intfs, $name if $config->$val_func("vrrp"); } else { push @intfs, $name if $config->existsOrig("vrrp"); } |