Add zuul scheduler to the git/gerrit puppet sequence
We have a race condition on project creation otherwise. Change-Id: Ia5741d69194ec6a3fcba6ca58552ce021c6aaa1f
This commit is contained in:
parent
b98a281adb
commit
e043e6e4bc
@ -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:
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user