openstack/ironic
Code Issues Proposed changes

Merge "Readability fixes for cleaning_reboot code"

Browse Source
This commit is contained in:
Jenkins 2016-03-30 19:14:58 +00:00 committed by Gerrit Code Review
commit cdfa120e06
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ironic/drivers/modules/agent_base_vendor.py
View File

@ -300,19 +300,18 @@ class BaseAgentVendor(base.VendorInterface):
manual_clean = node.target_provision_state == states.MANAGEABLE manual_clean = node.target_provision_state == states.MANAGEABLE
agent_commands = self._client.get_commands_status(task.node) agent_commands = self._client.get_commands_status(task.node)
if (not agent_commands and
task.node.driver_internal_info.get('cleaning_reboot')):
# Node finished a cleaning step that requested a reboot, and
# this is the first heartbeat after booting. Continue cleaning.
info = task.node.driver_internal_info
info.pop('cleaning_reboot', None)
task.node.driver_internal_info = info
self.notify_conductor_resume_clean(task)
return
if not agent_commands: if not agent_commands:
# Agent has no commands whatsoever if task.node.driver_internal_info.get('cleaning_reboot'):
return # Node finished a cleaning step that requested a reboot, and
# this is the first heartbeat after booting. Continue cleaning.
info = task.node.driver_internal_info
info.pop('cleaning_reboot', None)
task.node.driver_internal_info = info
self.notify_conductor_resume_clean(task)
return
else:
# Agent has no commands whatsoever
return
command = self._get_completed_cleaning_command(task, agent_commands) command = self._get_completed_cleaning_command(task, agent_commands)
LOG.debug('Cleaning command status for node %(node)s on step %(step)s:' LOG.debug('Cleaning command status for node %(node)s on step %(step)s:'