From 5ea925bb438403bd540b442a67cec9dc78169397 Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn Date: Mon, 7 Dec 2015 17:57:06 +0300 Subject: [PATCH] Add puppet log destination to container start.sh scripts Added --logdest /var/log/puppet/CONTAINER.log for each container that runs puppet (excluding rsync and rsyslog, which do not require a second puppet run). Change-Id: I013088c89cda5d746043922e23d1d91645779296 Closes-Bug: #1523543 --- docker/astute/start.sh | 1 + docker/cobbler/start.sh | 2 ++ docker/keystone/start.sh | 1 + docker/mcollective/start.sh | 2 ++ docker/nailgun/start.sh | 1 + docker/nginx/start.sh | 1 + docker/ostf/start.sh | 1 + docker/postgres/start.sh | 1 + docker/rabbitmq/start.sh | 1 + 9 files changed, 11 insertions(+) diff --git a/docker/astute/start.sh b/docker/astute/start.sh index d96e6d961..b49eee46b 100755 --- a/docker/astute/start.sh +++ b/docker/astute/start.sh @@ -10,4 +10,5 @@ mkdir -p /var/log/astute systemctl daemon-reload puppet apply --debug --verbose --color false --detailed-exitcodes \ + --logdest /var/log/puppet/astute.log \ /etc/puppet/modules/nailgun/examples/astute-only.pp diff --git a/docker/cobbler/start.sh b/docker/cobbler/start.sh index 258dd9615..3c5d411c1 100644 --- a/docker/cobbler/start.sh +++ b/docker/cobbler/start.sh @@ -24,9 +24,11 @@ fi systemctl daemon-reload puppet apply --debug --verbose --color false --detailed-exitcodes \ + --logdest /var/log/puppet/cobbler.log \ /etc/puppet/modules/nailgun/examples/cobbler-only.pp || [[ $? == 2 ]] puppet apply --debug --verbose --color false --detailed-exitcodes \ + --logdest /var/log/puppet/cobbler-dhcp-default-range.log \ /etc/puppet/modules/nailgun/examples/dhcp-default-range.pp || [[ $? == 2 ]] diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh index a9b6b4f75..cd587691e 100644 --- a/docker/keystone/start.sh +++ b/docker/keystone/start.sh @@ -9,4 +9,5 @@ rpm --rebuilddb systemctl daemon-reload puppet apply --debug --verbose --color false --detailed-exitcodes \ + --logdest /var/log/puppet/keystone.log \ /etc/puppet/modules/nailgun/examples/keystone-only.pp || [[ $? == 2 ]] diff --git a/docker/mcollective/start.sh b/docker/mcollective/start.sh index 6dae3977c..b8ca1e0b6 100644 --- a/docker/mcollective/start.sh +++ b/docker/mcollective/start.sh @@ -6,9 +6,11 @@ rm -f /var/lib/rpm/__db.* rpm --rebuilddb puppet apply --debug --verbose --color false --detailed-exitcodes \ + --logdest /var/log/puppet/mcollective-hiera.log \ /etc/puppet/modules/nailgun/examples/hiera-for-container.pp puppet apply --debug --verbose --color false --detailed-exitcodes \ + --logdest /var/log/puppet/mcollective.log \ /etc/puppet/modules/nailgun/examples/mcollective-only.pp for loopdev in $(seq 1 9); do diff --git a/docker/nailgun/start.sh b/docker/nailgun/start.sh index 04af1d4f9..6c20a8c6f 100644 --- a/docker/nailgun/start.sh +++ b/docker/nailgun/start.sh @@ -14,6 +14,7 @@ ln -sf /etc/fuel/version.yaml /etc/nailgun/version.yaml systemctl daemon-reload puppet apply --debug --verbose --color false --detailed-exitcodes \ + --logdest /var/log/puppet/nailgun.log \ /etc/puppet/modules/nailgun/examples/nailgun-only.pp diff --git a/docker/nginx/start.sh b/docker/nginx/start.sh index 9b26226d9..554b7ad01 100755 --- a/docker/nginx/start.sh +++ b/docker/nginx/start.sh @@ -13,4 +13,5 @@ chmod -R 755 /usr/share/nailgun/static 2>/dev/null systemctl daemon-reload puppet apply --debug --verbose --color false --detailed-exitcodes \ + --logdest /var/log/puppet/nginx.log \ /etc/puppet/modules/nailgun/examples/nginx-only.pp diff --git a/docker/ostf/start.sh b/docker/ostf/start.sh index 2817b12b3..121877c58 100644 --- a/docker/ostf/start.sh +++ b/docker/ostf/start.sh @@ -9,4 +9,5 @@ rpm --rebuilddb systemctl daemon-reload puppet apply --debug --verbose --color false --detailed-exitcodes \ + --logdest /var/log/puppet/ostf.log \ /etc/puppet/modules/nailgun/examples/ostf-only.pp diff --git a/docker/postgres/start.sh b/docker/postgres/start.sh index d2c4746f3..85cd33fe8 100644 --- a/docker/postgres/start.sh +++ b/docker/postgres/start.sh @@ -16,6 +16,7 @@ fi systemctl daemon-reload puppet apply --debug --verbose --color false --detailed-exitcodes \ + --logdest /var/log/puppet/postgres.log \ /etc/puppet/modules/nailgun/examples/postgres-only.pp diff --git a/docker/rabbitmq/start.sh b/docker/rabbitmq/start.sh index 4631a4c3f..9d0e70554 100644 --- a/docker/rabbitmq/start.sh +++ b/docker/rabbitmq/start.sh @@ -12,6 +12,7 @@ chown -R rabbitmq:rabbitmq /var/log/rabbitmq systemctl daemon-reload puppet apply --debug --verbose --color false --detailed-exitcodes \ + --logdest /var/log/puppet/rabbitmq.log \ /etc/puppet/modules/nailgun/examples/rabbitmq-only.pp || [[ $? == 2 ]]