openstack/octavia
Code Issues Proposed changes

Merge "Add missing log line for finishing amp operations" into stable/ussuri

Browse Source
This commit is contained in:
Zuul 2021-01-21 20:22:51 +00:00 committed by Gerrit Code Review
commit 6ef1564dba
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
octavia/controller/worker/v1/controller_worker.py
View File

@ -1110,7 +1110,8 @@ class ControllerWorker(base_taskflow.BaseTaskFlowEngine):
amp = self._amphora_repo.get(db_apis.get_session(),
id=amphora_id)
LOG.info("Start amphora cert rotation, amphora's id is: %s", amp.id)
LOG.info("Start amphora cert rotation, amphora's id is: %s",
amphora_id)
certrotation_amphora_tf = self._taskflow_load(
self._amphora_flows.cert_rotate_amphora_flow(),
@ -1120,6 +1121,8 @@ class ControllerWorker(base_taskflow.BaseTaskFlowEngine):
with tf_logging.DynamicLoggingListener(certrotation_amphora_tf,
log=LOG):
certrotation_amphora_tf.run()
LOG.info("Finished amphora cert rotation, amphora's id was: %s",
amphora_id)
def update_amphora_agent_config(self, amphora_id):
"""Update the amphora agent configuration.
@ -1149,3 +1152,5 @@ class ControllerWorker(base_taskflow.BaseTaskFlowEngine):
with tf_logging.DynamicLoggingListener(update_amphora_tf,
log=LOG):
update_amphora_tf.run()
LOG.info("Finished amphora agent configuration update, amphora's id "
"was: %s", amphora_id)

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

@ -1068,7 +1068,8 @@ class ControllerWorker(object):
amp = self._amphora_repo.get(db_apis.get_session(),
id=amphora_id)
LOG.info("Start amphora cert rotation, amphora's id is: %s", amp.id)
LOG.info("Start amphora cert rotation, amphora's id is: %s",
amphora_id)
store = {constants.AMPHORA: amp.to_dict(),
constants.AMPHORA_ID: amphora_id}
@ -1076,6 +1077,8 @@ class ControllerWorker(object):
self.services_controller.run_poster(
flow_utils.cert_rotate_amphora_flow,
store=store)
LOG.info("Finished amphora cert rotation, amphora's id was: %s",
amphora_id)
def update_amphora_agent_config(self, amphora_id):
"""Update the amphora agent configuration.
@ -1103,3 +1106,5 @@ class ControllerWorker(object):
self.services_controller.run_poster(
flow_utils.update_amphora_config_flow,
store=store)
LOG.info("Finished amphora agent configuration update, amphora's id "
"was: %s", amphora_id)