Merge "Fix placement of VRRP failover check"
This commit is contained in:
commit
a5dcefaeba
|
@ -273,9 +273,6 @@ class ActiveStandbyIptablesScenarioTest(
|
||||||
# Delete active amphora
|
# Delete active amphora
|
||||||
self.os_admin_servers_client.delete_server(active[const.COMPUTE_ID])
|
self.os_admin_servers_client.delete_server(active[const.COMPUTE_ID])
|
||||||
|
|
||||||
# Send some traffic
|
|
||||||
self.check_members_balanced(self.lb_vip_address)
|
|
||||||
|
|
||||||
# Wait for the amphora failover to start
|
# Wait for the amphora failover to start
|
||||||
waiters.wait_for_status(
|
waiters.wait_for_status(
|
||||||
self.mem_lb_client.show_loadbalancer,
|
self.mem_lb_client.show_loadbalancer,
|
||||||
|
@ -283,6 +280,9 @@ class ActiveStandbyIptablesScenarioTest(
|
||||||
const.PENDING_UPDATE, CONF.load_balancer.check_interval,
|
const.PENDING_UPDATE, CONF.load_balancer.check_interval,
|
||||||
CONF.load_balancer.check_timeout)
|
CONF.load_balancer.check_timeout)
|
||||||
|
|
||||||
|
# Send some traffic (checks VRRP failover)
|
||||||
|
self.check_members_balanced(self.lb_vip_address)
|
||||||
|
|
||||||
# Wait for the load balancer to return to ACTIVE
|
# Wait for the load balancer to return to ACTIVE
|
||||||
waiters.wait_for_status(
|
waiters.wait_for_status(
|
||||||
self.mem_lb_client.show_loadbalancer,
|
self.mem_lb_client.show_loadbalancer,
|
||||||
|
|
Loading…
Reference in New Issue