summaryrefslogtreecommitdiff
path: root/heat_cfntools
diff options
context:
space:
mode:
authorSimon Pasquier <simon.pasquier@bull.net>2014-02-12 15:16:49 +0100
committerSimon Pasquier <simon.pasquier@bull.net>2014-02-13 09:24:26 +0100
commit518c02dd0a5b6746205de924dde11fd893a86308 (patch)
tree4c374c6dfb82ca6b0d10edbca0d0da5c528a1caf /heat_cfntools
parent2202cfdd01750451e2bc2c3f3365c30700bfebea (diff)
downloadheat-cfntools-518c02dd0a5b6746205de924dde11fd893a86308.tar.gz
Log stdout and stderr on non-zero exit status
This helps troubleshooting failures when running cfn-init. Change-Id: I601506ab05d372307bb160b198a675f048e2e9ff Closes-Bug: #1269470
Diffstat (limited to 'heat_cfntools')
-rw-r--r--heat_cfntools/cfntools/cfn_helper.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/heat_cfntools/cfntools/cfn_helper.py b/heat_cfntools/cfntools/cfn_helper.py
index e699e6e..9579194 100644
--- a/heat_cfntools/cfntools/cfn_helper.py
+++ b/heat_cfntools/cfntools/cfn_helper.py
@@ -188,8 +188,10 @@ class CommandRunner(object):
self._stdout = output[0]
self._stderr = output[1]
if self._status:
- LOG.debug("Return code of %d after executing: '%s'" % (
- self._status, cmd))
+ LOG.debug("Return code of %d after executing: '%s'\n"
+ "stdout: '%s'\n"
+ "stderr: '%s'" % (self._status, cmd, self._stdout,
+ self._stderr))
if self._next:
self._next.run()
return self