diff options
author | Zuul <zuul@review.opendev.org> | 2023-03-14 19:27:16 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2023-03-14 19:27:16 +0000 |
commit | 821ce8c319a46cb212a9997fd8e9b964be6657fd (patch) | |
tree | 54a003681bef1ca28f5a6be5b91a9c05bfb5dbae /ironic | |
parent | 041e242e70afaf83cefebde1aa45fcbb581e74fc (diff) | |
parent | 47b5909486c336352c536eb2cadd121afea8cf12 (diff) | |
download | ironic-821ce8c319a46cb212a9997fd8e9b964be6657fd.tar.gz |
Merge "Wipe Agent Token when cleaning timeout occcurs"
Diffstat (limited to 'ironic')
-rw-r--r-- | ironic/conductor/utils.py | 4 | ||||
-rw-r--r-- | ironic/tests/unit/conductor/test_utils.py | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ironic/conductor/utils.py b/ironic/conductor/utils.py index 402ec2241..2272c0df7 100644 --- a/ironic/conductor/utils.py +++ b/ironic/conductor/utils.py @@ -488,9 +488,9 @@ def cleaning_error_handler(task, logmsg, errmsg=None, traceback=False, node.del_driver_internal_info('cleaning_reboot') node.del_driver_internal_info('cleaning_polling') node.del_driver_internal_info('skip_current_clean_step') - # We don't need to keep the old agent URL + # We don't need to keep the old agent URL, or token # as it should change upon the next cleaning attempt. - node.del_driver_internal_info('agent_url') + wipe_token_and_url(task) # For manual cleaning, the target provision state is MANAGEABLE, whereas # for automated cleaning, it is AVAILABLE. manual_clean = node.target_provision_state == states.MANAGEABLE diff --git a/ironic/tests/unit/conductor/test_utils.py b/ironic/tests/unit/conductor/test_utils.py index 563ac0b70..52fc72436 100644 --- a/ironic/tests/unit/conductor/test_utils.py +++ b/ironic/tests/unit/conductor/test_utils.py @@ -1197,6 +1197,9 @@ class ErrorHandlersTestCase(db_base.DbTestCase): self.node.set_driver_internal_info('skip_current_clean_step', True) self.node.set_driver_internal_info('clean_step_index', 0) self.node.set_driver_internal_info('agent_url', 'url') + self.node.set_driver_internal_info('agent_secret_token', 'foo') + self.node.set_driver_internal_info('agent_secret_token_pregenerated', + False) msg = 'error bar' last_error = "last error" @@ -1209,6 +1212,9 @@ class ErrorHandlersTestCase(db_base.DbTestCase): self.assertNotIn('cleaning_polling', self.node.driver_internal_info) self.assertNotIn('skip_current_clean_step', self.node.driver_internal_info) + self.assertNotIn('agent_secret_token', self.node.driver_internal_info) + self.assertNotIn('agent_secret_token_pregenerated', + self.node.driver_internal_info) self.assertEqual(last_error, self.node.last_error) self.assertTrue(self.node.maintenance) self.assertEqual(last_error, self.node.maintenance_reason) |