Merge "Use ansible logging during puppet run_all.sh"

This commit is contained in:
Jenkins 2015-02-13 08:12:52 +00:00 committed by Gerrit Code Review
commit 5128891eac

View File

@ -18,6 +18,7 @@
# fails then abort the puppet run as we will not get the results we # fails then abort the puppet run as we will not get the results we
# expect. # expect.
set -e set -e
export ANSIBLE_LOG_PATH=/var/log/puppet_run_all.log
cd /opt/system-config/production cd /opt/system-config/production
git fetch -a && git reset -q --hard @{u} 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 # First run the git/gerrit sequence, since it's important that they all work
# together # 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 # Run AFS changes separately so we can make sure to only do one at a time
# (turns out quorum is nice to have) # (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 # 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