openstack
/
octavia
Code Issues Proposed changes

Add missing log line for finishing amp operations 

Both amp config and amp cert rotate were missing Finished log lines.

Conflicts:
  octavia/controller/worker/v2/controller_worker.py

Change-Id: I86add89ed7ea474dcb24962547c78460bc2e260c
(cherry picked from commit 6b182b50cd)
(cherry picked from commit 0afb17c434)
This commit is contained in:
Adam Harwell 2020-08-11 16:36:49 -07:00 committed by Carlos Goncalves
parent 8c32d2e602
commit 4aa5633250
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

@ -1057,7 +1057,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(),
@ -1067,6 +1068,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.
@ -1096,3 +1099,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

@ -948,7 +948,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(),
@ -958,6 +959,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.
@ -987,3 +990,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)