openstack/ironic
Code Issues Proposed changes

Merge "Remove unneeded exception handling from conductor"

Browse Source
This commit is contained in:
Jenkins 2016-10-12 18:49:39 +00:00 committed by Gerrit Code Review
commit cd4179af66
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ironic/conductor/manager.py
View File

@ -566,12 +566,7 @@ class ConductorManager(base_manager.BaseConductorManager):
node.save()
# Begin cleaning
try:
task.process_event('clean')
except exception.InvalidState:
raise exception.InvalidStateRequested(
action='clean', node=node.uuid,
state=node.provision_state)
task.process_event('clean')
self._do_node_clean(task)
def _get_node_next_clean_steps(self, task, skip_current_step=True):