x/vmware-nsx
Code Issues Proposed changes

Merge "Restore GARP by default for floating IPs"

Browse Source
This commit is contained in:
Jenkins 2014-05-21 13:58:52 +00:00 committed by Gerrit Code Review
commit 6e9657bbf0
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/l3_agent.ini
View File

@ -50,7 +50,7 @@
# Send this many gratuitous ARPs for HA setup. Set it below or equal to 0
# to disable this feature.
# send_arp_for_ha = 0
# send_arp_for_ha = 3
# seconds between re-sync routers' data if needed
# periodic_interval = 40

2
neutron/agent/l3_agent.py
View File

@ -164,7 +164,7 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback, manager.Manager):
help=_("TCP Port used by Neutron metadata namespace "
"proxy.")),
cfg.IntOpt('send_arp_for_ha',
default=0,
default=3,
help=_("Send this many gratuitous ARPs for HA setup, if "
"less than or equal to 0, the feature is disabled")),
cfg.StrOpt('router_id', default='',

1
neutron/tests/unit/test_l3_agent.py
View File

@ -50,7 +50,6 @@ class TestBasicRouterOperations(base.BaseTestCase):
self.conf.set_override('router_id', 'fake_id')
self.conf.set_override('interface_driver',
'neutron.agent.linux.interface.NullDriver')
self.conf.set_override('send_arp_for_ha', 1)
self.conf.root_helper = 'sudo'
self.device_exists_p = mock.patch(