From 89252d9285affe8a27fe3f03e94e596347a8edd2 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 6 Sep 2018 09:05:44 -0700 Subject: [PATCH] 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 --- run_all.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/run_all.sh b/run_all.sh index bcb3d1160c..0c7475b39e 100755 --- a/run_all.sh +++ b/run_all.sh @@ -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