Merge "Fix an issue with failover on VIP net without DHCP"
This commit is contained in:
commit
c8615b7ec4
|
@ -121,7 +121,7 @@ class HaproxyAmphoraLoadBalancerDriver(
|
||||||
|
|
||||||
port = amphorae_network_config.get(amphora.id).vrrp_port
|
port = amphorae_network_config.get(amphora.id).vrrp_port
|
||||||
LOG.debug("Post-VIP-Plugging with vrrp_ip %s vrrp_port %s",
|
LOG.debug("Post-VIP-Plugging with vrrp_ip %s vrrp_port %s",
|
||||||
amphora.vrrp_ip, port)
|
amphora.vrrp_ip, port.id)
|
||||||
host_routes = [{'nexthop': hr.nexthop,
|
host_routes = [{'nexthop': hr.nexthop,
|
||||||
'destination': hr.destination}
|
'destination': hr.destination}
|
||||||
for hr in subnet.host_routes]
|
for hr in subnet.host_routes]
|
||||||
|
|
|
@ -337,10 +337,16 @@ class AmphoraFlows(object):
|
||||||
failover_amphora_flow.add(database_tasks.UpdateAmpFailoverDetails(
|
failover_amphora_flow.add(database_tasks.UpdateAmpFailoverDetails(
|
||||||
requires=(constants.AMPHORA, constants.AMP_DATA)))
|
requires=(constants.AMPHORA, constants.AMP_DATA)))
|
||||||
|
|
||||||
|
# Update the data stored in the flow from the database
|
||||||
failover_amphora_flow.add(database_tasks.ReloadLoadBalancer(
|
failover_amphora_flow.add(database_tasks.ReloadLoadBalancer(
|
||||||
requires=constants.LOADBALANCER_ID,
|
requires=constants.LOADBALANCER_ID,
|
||||||
provides=constants.LOADBALANCER))
|
provides=constants.LOADBALANCER))
|
||||||
|
|
||||||
|
failover_amphora_flow.add(database_tasks.ReloadAmphora(
|
||||||
|
requires=constants.AMPHORA_ID,
|
||||||
|
provides=constants.AMPHORA))
|
||||||
|
|
||||||
|
# Prepare to reconnect the network interface(s)
|
||||||
failover_amphora_flow.add(network_tasks.GetAmphoraeNetworkConfigs(
|
failover_amphora_flow.add(network_tasks.GetAmphoraeNetworkConfigs(
|
||||||
requires=constants.LOADBALANCER,
|
requires=constants.LOADBALANCER,
|
||||||
provides=constants.AMPHORAE_NETWORK_CONFIG))
|
provides=constants.AMPHORAE_NETWORK_CONFIG))
|
||||||
|
|
Loading…
Reference in New Issue