From e043e6e4bc8daca282215ba486bb09f3dc756161 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 18 Dec 2017 09:45:50 -0600 Subject: [PATCH] Add zuul scheduler to the git/gerrit puppet sequence We have a race condition on project creation otherwise. Change-Id: Ia5741d69194ec6a3fcba6ca58552ce021c6aaa1f --- playbooks/remote_puppet_else.yaml | 2 +- playbooks/remote_puppet_git.yaml | 9 +++++++++ run_all.sh | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/playbooks/remote_puppet_else.yaml b/playbooks/remote_puppet_else.yaml index fc768cdffc..41e9a2d804 100644 --- a/playbooks/remote_puppet_else.yaml +++ b/playbooks/remote_puppet_else.yaml @@ -1,4 +1,4 @@ -- hosts: '!review.openstack.org:!git0*:!afs*:!baremetal*:!controller*:!compute*:!puppetmaster*:!disabled' +- hosts: '!review.openstack.org:!git0*:!zuulv3*:!afs*:!baremetal*:!controller*:!compute*:!puppetmaster*:!disabled' strategy: free gather_facts: true roles: diff --git a/playbooks/remote_puppet_git.yaml b/playbooks/remote_puppet_git.yaml index 0c7a30bf82..332fc0c336 100644 --- a/playbooks/remote_puppet_git.yaml +++ b/playbooks/remote_puppet_git.yaml @@ -29,3 +29,12 @@ project_config_ref: "{{ hostvars.localhost.gitinfo.after }}" vars: puppet_timeout: 60m +- hosts: "zuulv3.openstack.org:!disabled" + strategy: free + gather_facts: true + roles: + - role: puppet + facts: + project_config_ref: "{{ hostvars.localhost.gitinfo.after }}" + vars: + puppet_timeout: 60m diff --git a/run_all.sh b/run_all.sh index f6f8b19cc5..35ed289a94 100755 --- a/run_all.sh +++ b/run_all.sh @@ -32,7 +32,7 @@ set +e # First, sync the puppet repos with all the machines timeout -k 2m 120m ansible-playbook -f 10 ${ANSIBLE_PLAYBOOKS}/update_puppet.yaml -# Run the git/gerrit sequence, since it's important that they all work together +# Run the git/gerrit/zuul sequence, since it's important that they all work together timeout -k 2m 120m ansible-playbook -f 10 ${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)