summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-28 15:57:33 +0000
committerGerrit Code Review <review@openstack.org>2017-07-28 15:57:33 +0000
commit951ba92f55f184fd342bc5e7af11113c6b3b10b6 (patch)
treea5fcc14769af049e1397ddc0caf7f8313f58386e /docker
parent9e74d2d0acdc44e90c3be7a907d194d6102a830c (diff)
parent6073155d624f33dae7146c1f35887290fd92a783 (diff)
Merge "Also log docker-puppet.py puppet output to console"
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