Glob zuulv3 and zuul01 as zuul* in playbooks

To avoid the need for regular expression matching, switch to a
simple glob of zuul* covering zuulv3 and zuul01 servers. Now that
zuul-dev and zuulv3-dev are gone, this glob will only match the two
remaining hosts mentioned.

Change-Id: I2749ffa6c0e4d2ea6626d1ebde1d7b3ab49378bb
This commit is contained in:
Jeremy Stanley 2018-01-16 23:40:48 +00:00
parent d547105fba
commit 9cc99d4b47
2 changed files with 2 additions and 11 deletions

View File

@ -1,4 +1,4 @@
- hosts: '!review.openstack.org:!git0*:!zuul[0-9]+.*:!zuulv3*:!afs*:!baremetal*:!controller*:!compute*:!puppetmaster*:!disabled'
- hosts: '!review.openstack.org:!git0*:!zuul*:!afs*:!baremetal*:!controller*:!compute*:!puppetmaster*:!disabled'
strategy: free
gather_facts: true
roles:

View File

@ -29,16 +29,7 @@
project_config_ref: "{{ hostvars.localhost.gitinfo.after }}"
vars:
puppet_timeout: 60m
- hosts: "zuul[0-9]+.openstack.org:!disabled"
strategy: free
gather_facts: true
roles:
- role: puppet
facts:
project_config_ref: "{{ hostvars.localhost.gitinfo.after }}"
vars:
puppet_timeout: 60m
- hosts: "zuulv3.openstack.org:!disabled"
- hosts: "zuul*.openstack.org:!disabled"
strategy: free
gather_facts: true
roles: