summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorBogdan Dobrelya <bdobreli@redhat.com>2017-07-28 11:25:42 +0200
committerBogdan Dobrelya <bdobreli@redhat.com>2017-07-28 11:25:42 +0200
commit6073155d624f33dae7146c1f35887290fd92a783 (patch)
treedddc142f502c089cfe996239f36913b7e0ed500f /docker
parent8193431e944841dfc42f6796eabb2b30afe4b1f1 (diff)
Also log docker-puppet.py puppet output to console
Running puppet apply with --logdest syslog results in all the output being redirected to syslog. You get no error messages. In the case where this fails, the subsequent debug task shows nothing useful as there was no stdout/stderr. Also pass --logdest console to docker-puppet's puppet apply so that we get the output for the debug task. Related-Bug: #1707030 Change-Id: I67df5eee9916237420ca646a16e188f26c828c0e Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/docker-puppet.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py
index 36c63887..fadd12d3 100755
--- a/docker/docker-puppet.py
+++ b/docker/docker-puppet.py
@@ -211,7 +211,7 @@ def mp_puppet_config((config_volume, puppet_tags, manifest, config_image, volume
sync
FACTER_hostname=$HOSTNAME FACTER_uuid=docker /usr/bin/puppet apply \
- --color=false --logdest syslog $TAGS /etc/config.pp
+ --color=false --logdest syslog --logdest console $TAGS /etc/config.pp
# Disables archiving
if [ -z "$NO_ARCHIVE" ]; then