From b9945fccec4c02754c9469310e71195015a40bb2 Mon Sep 17 00:00:00 2001 From: Gregory Haynes Date: Mon, 9 Feb 2015 14:57:37 -0800 Subject: [PATCH] Use ansible logging during puppet run_all.sh When ansible-playbook outputs to stdout it does not include timestamps, but ansible logging does. Change-Id: Ifb63d34d1dcc7931d734d08dc31223b531d65aa2 --- run_all.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/run_all.sh b/run_all.sh index 42dad62f89..f6e25f11f1 100755 --- a/run_all.sh +++ b/run_all.sh @@ -18,6 +18,7 @@ # fails then abort the puppet run as we will not get the results we # expect. set -e +export ANSIBLE_LOG_PATH=/var/log/puppet_run_all.log cd /opt/system-config/production git fetch -a && git reset -q --hard @{u} @@ -34,9 +35,9 @@ set +e # First run the git/gerrit sequence, since it's important that they all work # together -ansible-playbook /etc/ansible/playbooks/remote_puppet_git.yaml >> /var/log/puppet_run_all.log 2>&1 +ansible-playbook /etc/ansible/playbooks/remote_puppet_git.yaml # Run AFS changes separately so we can make sure to only do one at a time # (turns out quorum is nice to have) -ansible-playbook -f 1 /etc/ansible/playbooks/remote_puppet_afs.yaml >> /var/log/puppet_run_all.log 2>&1 +ansible-playbook -f 1 /etc/ansible/playbooks/remote_puppet_afs.yaml # Run everything else. We do not care if the other things worked -ansible-playbook /etc/ansible/playbooks/remote_puppet_else.yaml >> /var/log/puppet_run_all.log 2>&1 +ansible-playbook /etc/ansible/playbooks/remote_puppet_else.yaml