diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-24 03:34:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-24 03:34:50 +0000 |
| commit | 921d79c98848b9b26628da177a5353ff1afd438d (patch) | |
| tree | 9340f768420cf9e284a35b027f4d0a8e335ff5bd | |
| parent | 031d4f18f1c51f2a681e23548d892429cf936c68 (diff) | |
| parent | 9877f12d5a683a12975a6619ee5c3cd68a3541a7 (diff) | |
| download | ironic-921d79c98848b9b26628da177a5353ff1afd438d.tar.gz | |
Merge "Fix: Next cleaning hangs if the previous cleaning was aborted" into stable/liberty
| -rw-r--r-- | ironic/conductor/manager.py | 1 | ||||
| -rw-r--r-- | ironic/tests/conductor/test_manager.py | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/ironic/conductor/manager.py b/ironic/conductor/manager.py index 2bf83747a..b4bee3161 100644 --- a/ironic/conductor/manager.py +++ b/ironic/conductor/manager.py @@ -1123,6 +1123,7 @@ class ConductorManager(periodic_task.PeriodicTasks): info_message += msg node.last_error = last_error + node.clean_step = None node.save() LOG.info(info_message) diff --git a/ironic/tests/conductor/test_manager.py b/ironic/tests/conductor/test_manager.py index 3651397aa..9907da370 100644 --- a/ironic/tests/conductor/test_manager.py +++ b/ironic/tests/conductor/test_manager.py @@ -1588,6 +1588,8 @@ class DoNodeDeployTearDownTestCase(_ServiceSetUpMixin, tear_mock.assert_called_once_with(task.driver.deploy, task) if step_name: self.assertIn(step_name, task.node.last_error) + # assert node's clean_step was cleaned up + self.assertEqual({}, task.node.clean_step) def test__do_node_clean_abort(self): self._test__do_node_clean_abort(None) |