Fix failover with L3 HA
Since there was a few changes inside Neutron which now use primary instead of master, failover did not properly function. This patch handles both master/primary until Neutron moves those keywords into constants inside neutron-lib. Change-Id: I9ff278801a400c52cc52d23b62b0b8447f91ebd8
This commit is contained in:
parent
805d3851a5
commit
76b606b8db
@ -89,7 +89,7 @@ class VPNAgent(l3_extension.L3AgentExtension):
|
|||||||
for device_driver in self.device_drivers:
|
for device_driver in self.device_drivers:
|
||||||
if router_id in device_driver.processes:
|
if router_id in device_driver.processes:
|
||||||
process = device_driver.processes[router_id]
|
process = device_driver.processes[router_id]
|
||||||
if state == 'master':
|
if state in ('master', 'primary'):
|
||||||
process.enable()
|
process.enable()
|
||||||
else:
|
else:
|
||||||
process.disable()
|
process.disable()
|
||||||
|
@ -490,7 +490,7 @@ class TestIPSecBase(base.BaseSudoTestCase):
|
|||||||
site.backup_router = self.create_router(self.failover_agent,
|
site.backup_router = self.create_router(self.failover_agent,
|
||||||
backup_info)
|
backup_info)
|
||||||
linux_utils.wait_until_true(
|
linux_utils.wait_until_true(
|
||||||
lambda: site.router.ha_state == 'master')
|
lambda: site.router.ha_state in ('master', 'primary'))
|
||||||
linux_utils.wait_until_true(
|
linux_utils.wait_until_true(
|
||||||
lambda: site.backup_router.ha_state == 'backup')
|
lambda: site.backup_router.ha_state == 'backup')
|
||||||
|
|
||||||
@ -558,7 +558,8 @@ class TestIPSecBase(base.BaseSudoTestCase):
|
|||||||
device_name = router1.get_ha_device_name()
|
device_name = router1.get_ha_device_name()
|
||||||
ha_device = ip_lib.IPDevice(device_name, router1.ns_name)
|
ha_device = ip_lib.IPDevice(device_name, router1.ns_name)
|
||||||
ha_device.link.set_down()
|
ha_device.link.set_down()
|
||||||
linux_utils.wait_until_true(lambda: router2.ha_state == 'master')
|
linux_utils.wait_until_true(
|
||||||
|
lambda: router2.ha_state in ('master', 'primary'))
|
||||||
linux_utils.wait_until_true(lambda: router1.ha_state == 'backup')
|
linux_utils.wait_until_true(lambda: router1.ha_state == 'backup')
|
||||||
|
|
||||||
def _ipsec_process_exists(self, conf, router, pid_files):
|
def _ipsec_process_exists(self, conf, router, pid_files):
|
||||||
|
Loading…
Reference in New Issue
Block a user