Revert "Fix ansible forks env variable"

And revert "Set Ansible forks to 50"

This doesn't seem to have helped, and may have made the run longer.
I suspect a problem with the env var, but let's revert back to the
old value and mechanism (cli flag) to re-establish a baseline,
then we'll change the value of the cli flag.

This reverts commit 84199095716da416849ed4a2649ec8a2c878609d.
This reverts commit 97d8f9d0bfaec24413f134fe252d4011fe9e36d4.

Change-Id: I825b2b3db26ce6dd7d70fcc8b33e70b511eb52db
This commit is contained in:
James E. Blair 2018-09-06 09:05:44 -07:00
parent 447baf2c60
commit 89252d9285

View File

@ -21,7 +21,6 @@ set -e
SYSTEM_CONFIG=/opt/system-config
ANSIBLE_PLAYBOOKS=$SYSTEM_CONFIG/playbooks
export ANSIBLE_FORKS=50
echo "--- begin run @ $(date -Is) ---"
@ -40,18 +39,18 @@ timeout -k 2m 120m ansible-playbook ${ANSIBLE_PLAYBOOKS}/update-system-config.ya
timeout -k 2m 120m ansible-playbook ${ANSIBLE_PLAYBOOKS}/bridge.yaml
# Run the base playbook everywhere
timeout -k 2m 120m ansible-playbook ${ANSIBLE_PLAYBOOKS}/base.yaml
timeout -k 2m 120m ansible-playbook -f 20 ${ANSIBLE_PLAYBOOKS}/base.yaml
# Update the puppet version
timeout -k 2m 120m ansible-playbook ${ANSIBLE_PLAYBOOKS}/update_puppet_version.yaml
timeout -k 2m 120m ansible-playbook -f 20 ${ANSIBLE_PLAYBOOKS}/update_puppet_version.yaml
# Run the git/gerrit/zuul sequence, since it's important that they all work together
timeout -k 2m 120m ansible-playbook ${ANSIBLE_PLAYBOOKS}/remote_puppet_git.yaml
timeout -k 2m 120m ansible-playbook -f 20 ${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)
timeout -k 2m 120m ansible-playbook -f 1 ${ANSIBLE_PLAYBOOKS}/remote_puppet_afs.yaml
# Run everything else. We do not care if the other things worked
timeout -k 2m 120m ansible-playbook ${ANSIBLE_PLAYBOOKS}/remote_puppet_else.yaml
timeout -k 2m 120m ansible-playbook -f 20 ${ANSIBLE_PLAYBOOKS}/remote_puppet_else.yaml
echo "--- end run @ $(date -Is) ---"
echo