diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-06-12 04:08:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-06-12 04:08:30 +0000 |
| commit | fc56b931481a34d903ea3447c25c3df6fd596aee (patch) | |
| tree | ab3c2cd3d58607963217b89a087e6a5530bc10b8 | |
| parent | 0a7dc728f743f7e4ea5257f5151ca76359b1d2b0 (diff) | |
| parent | f3a62d5ca304d867c0b69ff67a90e6b542eac054 (diff) | |
| download | ironic-fc56b931481a34d903ea3447c25c3df6fd596aee.tar.gz | |
Merge "Add node id to DEBUG messages in impitool"2014.2.b1
| -rw-r--r-- | ironic/drivers/modules/ipmitool.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ironic/drivers/modules/ipmitool.py b/ironic/drivers/modules/ipmitool.py index 6de92ee64..d5c909ff3 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: |