openstack/octavia
Code Issues Proposed changes

Merge "Use run_flow for failover functions in v2 control worker"

Browse Source
This commit is contained in:
Zuul 2020-10-30 19:26:42 +00:00 committed by Gerrit Code Review
commit 198980639c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
octavia/controller/worker/v2/controller_worker.py
View File

@ -172,7 +172,7 @@ class ControllerWorker(object):
if not db_health_monitor: if not db_health_monitor:
LOG.warning('Failed to fetch %s %s from DB. Retrying for up to ' LOG.warning('Failed to fetch %s %s from DB. Retrying for up to '
'60 seconds.', 'healthmonitor', '60 seconds.', 'healthmonitor',
db_health_monitor[constants.HEALTHMONITOR_ID]) health_monitor[constants.HEALTHMONITOR_ID])
raise db_exceptions.NoResultFound raise db_exceptions.NoResultFound
pool = db_health_monitor.pool pool = db_health_monitor.pool
@ -922,7 +922,7 @@ class ControllerWorker(object):
constants.LOADBALANCER_ID: lb_id, constants.LOADBALANCER_ID: lb_id,
constants.VIP: vip_dict} constants.VIP: vip_dict}
self.services_controller.run_poster( self.run_flow(
flow_utils.get_failover_amphora_flow, flow_utils.get_failover_amphora_flow,
amphora.to_dict(), lb_amp_count, amphora.to_dict(), lb_amp_count,
store=stored_params, wait=True) store=stored_params, wait=True)
@ -1074,7 +1074,7 @@ class ControllerWorker(object):
else: else:
stored_params[constants.AVAILABILITY_ZONE] = {} stored_params[constants.AVAILABILITY_ZONE] = {}
self.services_controller.run_poster( self.run_flow(
flow_utils.get_failover_LB_flow, amps, provider_lb_dict, flow_utils.get_failover_LB_flow, amps, provider_lb_dict,
store=stored_params, wait=True) store=stored_params, wait=True)