openstack
/
octavia
Code Issues Proposed changes

Merge "Fix an issue with failover on VIP net without DHCP"

This commit is contained in:
Jenkins 2017-06-12 21:14:19 +00:00 committed by Gerrit Code Review
parent c4ed4d5cce 56ab54008c
commit c8615b7ec4
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
octavia/amphorae/drivers/haproxy/rest_api_driver.py
View File

@ -121,7 +121,7 @@ class HaproxyAmphoraLoadBalancerDriver(
port = amphorae_network_config.get(amphora.id).vrrp_port
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,
'destination': hr.destination}
for hr in subnet.host_routes]

6
octavia/controller/worker/flows/amphora_flows.py
View File

@ -337,10 +337,16 @@ class AmphoraFlows(object):
failover_amphora_flow.add(database_tasks.UpdateAmpFailoverDetails(
requires=(constants.AMPHORA, constants.AMP_DATA)))
# Update the data stored in the flow from the database
failover_amphora_flow.add(database_tasks.ReloadLoadBalancer(
requires=constants.LOADBALANCER_ID,
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(
requires=constants.LOADBALANCER,
provides=constants.AMPHORAE_NETWORK_CONFIG))