openstack/ironic
Code Issues Proposed changes

Merge "Fix logging if power interface does not support timeout"

Browse Source
This commit is contained in:
Jenkins 2017-01-12 20:01:59 +00:00 committed by Gerrit Code Review
commit 0588db3415
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ironic/conductor/utils.py
View File

@ -165,7 +165,7 @@ def node_power_action(task, new_state, timeout=None):
# After driver composition, we should print power interface # After driver composition, we should print power interface
# name here instead of driver. # name here instead of driver.
LOG.warning( LOG.warning(
_LW("The set_power_state method of %s(driver_name)s " _LW("The set_power_state method of %(driver_name)s "
"doesn't support 'timeout' parameter."), "doesn't support 'timeout' parameter."),
{'driver_name': node.driver}) {'driver_name': node.driver})
task.driver.power.set_power_state(task, new_state) task.driver.power.set_power_state(task, new_state)
@ -174,7 +174,7 @@ def node_power_action(task, new_state, timeout=None):
task.driver.power.reboot).parameters): task.driver.power.reboot).parameters):
task.driver.power.reboot(task, timeout=timeout) task.driver.power.reboot(task, timeout=timeout)
else: else:
LOG.warning(_LW("The reboot method of %s(driver_name)s " LOG.warning(_LW("The reboot method of %(driver_name)s "
"doesn't support 'timeout' parameter."), "doesn't support 'timeout' parameter."),
{'driver_name': node.driver}) {'driver_name': node.driver})
task.driver.power.reboot(task) task.driver.power.reboot(task)