From f3a62d5ca304d867c0b69ff67a90e6b542eac054 Mon Sep 17 00:00:00 2001 From: Ellen Hui Date: Tue, 10 Jun 2014 00:24:49 +0000 Subject: Add node id to DEBUG messages in impitool Change-Id: Ic421350c4c5f8278ac020ee6a521026960e88634 Closes-Bug: #1319637 --- ironic/drivers/modules/ipmitool.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ironic/drivers/modules/ipmitool.py b/ironic/drivers/modules/ipmitool.py index 8dabd220f..89ecea989 100644 --- a/ironic/drivers/modules/ipmitool.py +++ b/ironic/drivers/modules/ipmitool.py @@ -148,8 +148,9 @@ def _exec_ipmitool(driver_info, command): args.append(pw_file) args.extend(command.split(" ")) out, err = utils.execute(*args, attempts=3) - LOG.debug("ipmitool stdout: '%(out)s', stderr: '%(err)s'", - {'out': out, 'err': err}) + LOG.debug("ipmitool stdout: '%(out)s', stderr: '%(err)s', from node " + "%(node_id)s", + {'out': out, 'err': err, 'node_id': driver_info['uuid']}) return out, err @@ -210,8 +211,9 @@ def _set_and_wait(target_state, driver_info): if (sleep_time + mutable['total_time']) > CONF.ipmi.retry_timeout: # Stop if the next loop would exceed maximum retry_timeout LOG.error(_('IPMI power %(state)s timed out after ' - '%(tries)s retries.'), - {'state': state_name, 'tries': mutable['iter']}) + '%(tries)s retries on node %(node_id)s.'), + {'state': state_name, 'tries': mutable['iter'], + 'node_id': driver_info['uuid']}) mutable['power'] = states.ERROR raise loopingcall.LoopingCallDone() else: -- cgit v1.2.1