diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2011-12-02 15:37:36 -0800 |
|---|---|---|
| committer | Stephen Hemminger <shemminger@vyatta.com> | 2011-12-02 15:37:36 -0800 |
| commit | 8426b9dcd6ddbe8c627b925e2d31f86a299ffa2f (patch) | |
| tree | 31711c1a50e31e5406618d821fea59495f848bae | |
| parent | e8c8ebfc74203309871d4f291a378565f7ca4181 (diff) | |
| parent | 94bf99b056a4e2a83994e2b803d7140c972f2d11 (diff) | |
| download | vyatta-cfg-system-8426b9dcd6ddbe8c627b925e2d31f86a299ffa2f.tar.gz vyatta-cfg-system-8426b9dcd6ddbe8c627b925e2d31f86a299ffa2f.zip | |
Merge branch 'oxnard' of fiji.vyatta.com:/git/vyatta-cfg-system into oxnard
| -rw-r--r-- | debian/changelog | 17 | ||||
| -rwxr-xr-x | scripts/keepalived/vyatta-vrrp-state.pl | 2 |
2 files changed, 19 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 84e13a01..32d60d50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +vyatta-cfg-system (0.19.136) unstable; urgency=low + + * Set accept_local on vrrp interfaces so that transition from 'current + master that is not address owner' to 'address owner that is + requesting master' can occur + * 0.19.135 + + -- John Southworth <john.southworth@vyatta.com> Fri, 02 Dec 2011 14:49:40 -0800 + +vyatta-cfg-system (0.19.135) unstable; urgency=low + + * Set accept_local on vrrp interfaces so that transition from 'current + master that is not address owner' to 'address owner that is + requesting master' can occur + + -- John Southworth <john.southworth@vyatta.com> Fri, 02 Dec 2011 14:49:22 -0800 + vyatta-cfg-system (0.19.134) unstable; urgency=low * Add vrrp interface description for bonding vif diff --git a/scripts/keepalived/vyatta-vrrp-state.pl b/scripts/keepalived/vyatta-vrrp-state.pl index eab717bf..53c7c6c9 100755 --- a/scripts/keepalived/vyatta-vrrp-state.pl +++ b/scripts/keepalived/vyatta-vrrp-state.pl @@ -71,6 +71,7 @@ if ($vrrp_state eq 'backup') { # Vyatta::Keepalived::snoop_for_master($vrrp_intf, $vrrp_group, # $vrrp_vips[0], 60); system("sysctl -w net.ipv4.conf.".$vrrp_intf."v".$vrrp_group.".arp_filter=1"); + system("sysctl -w net.ipv4.conf.".$vrrp_intf."v".$vrrp_group.".accept_local=1"); } elsif ($vrrp_state eq 'master') { # # keepalived will send gratuitous arp requests on master transition @@ -79,6 +80,7 @@ if ($vrrp_state eq 'backup') { # so here we will send 5 gratuitous arp replies also. # system("sysctl -w net.ipv4.conf.".$vrrp_intf."v".$vrrp_group.".arp_filter=0"); + system("sysctl -w net.ipv4.conf.".$vrrp_intf."v".$vrrp_group.".accept_local=1"); foreach my $vip (@vrrp_vips) { system("/usr/bin/arping -A -c5 -I $vrrp_intf $vip"); } |