diff options
| author | Dmitry Tantsur <dtantsur@protonmail.com> | 2020-08-04 09:39:37 +0200 |
|---|---|---|
| committer | Dmitry Tantsur <dtantsur@protonmail.com> | 2020-08-06 07:45:16 +0000 |
| commit | a61bd37418a2834770bef9b8f0155a2b6ab02e33 (patch) | |
| tree | c501f42adfbf7e69c95565039df7a2270e354756 /ironic/conductor/manager.py | |
| parent | a53bba694b49fbfd5e17f0aea8e889368ba02d43 (diff) | |
| download | ironic-a61bd37418a2834770bef9b8f0155a2b6ab02e33.tar.gz | |
Wipe agent token and URL on rescue and unrescue
Yet another place where we missed it :(
Change-Id: Iaa56e5965806e975ed0f97f2d6a0d15e13351c22
(cherry picked from commit 0b0ab9eb167c5a568141518e5a4698fc7f601d2b)
Diffstat (limited to 'ironic/conductor/manager.py')
| -rw-r--r-- | ironic/conductor/manager.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ironic/conductor/manager.py b/ironic/conductor/manager.py index ea8e3daea..6eb0cb03e 100644 --- a/ironic/conductor/manager.py +++ b/ironic/conductor/manager.py @@ -602,12 +602,13 @@ class ConductorManager(base_manager.BaseConductorManager): node_id, purpose='node rescue') as task: node = task.node - # Record of any pre-existing agent_url should be removed. - utils.remove_agent_url(node) if node.maintenance: raise exception.NodeInMaintenance(op=_('rescuing'), node=node.uuid) + # Record of any pre-existing agent_url should be removed. + utils.wipe_token_and_url(task) + # driver validation may check rescue_password, so save it on the # node early i_info = node.instance_info @@ -754,6 +755,9 @@ class ConductorManager(base_manager.BaseConductorManager): handle_failure(e, _('Failed to unrescue. Exception: %s'), log_func=LOG.exception) + + utils.wipe_token_and_url(task) + if next_state == states.ACTIVE: task.process_event('done') else: |