diff options
| author | Dmitry Tantsur <dtantsur@protonmail.com> | 2021-04-08 13:42:25 +0200 |
|---|---|---|
| committer | Dmitry Tantsur <dtantsur@protonmail.com> | 2021-04-08 13:42:25 +0200 |
| commit | c6e8281f85f52d2708eb369e2c2fcf395443afdc (patch) | |
| tree | 9eacb4dadd0c330adc3ea52b9886a8cbf01f9db7 /ironic/conductor/manager.py | |
| parent | 4d7902151300b3d08a7047365b2bd1e5ba49fa05 (diff) | |
| download | ironic-c6e8281f85f52d2708eb369e2c2fcf395443afdc.tar.gz | |
Wipe agent tokens on inspection start and abort
Also make sure the pregenerated flag is always reset.
Change-Id: I73aaa803d3eb84ddac59a778e998836a645217eb
Diffstat (limited to 'ironic/conductor/manager.py')
| -rw-r--r-- | ironic/conductor/manager.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ironic/conductor/manager.py b/ironic/conductor/manager.py index c26b10930..2daa73749 100644 --- a/ironic/conductor/manager.py +++ b/ironic/conductor/manager.py @@ -1333,6 +1333,7 @@ class ConductorManager(base_manager.BaseConductorManager): 'Error: %s') % e node.save() node.last_error = _('Inspection was aborted by request.') + utils.wipe_token_and_url(task) task.process_event('abort') LOG.info('Successfully aborted inspection of node %(node)s', {'node': node.uuid}) @@ -3680,9 +3681,9 @@ def _do_inspect_hardware(task): log_func("Failed to inspect node %(node)s: %(err)s", {'node': node.uuid, 'err': e}) - # Remove agent_url, while not strictly needed for the inspection path, - # lets just remove it out of good practice. - utils.remove_agent_url(node) + # Inspection cannot start in fast-track mode, wipe token and URL. + utils.wipe_token_and_url(task) + try: new_state = task.driver.inspect.inspect_hardware(task) except exception.IronicException as e: |