opendev/system-config
Code Issues Proposed changes

Merge "Remove bridge from disabled and add puppet group"

Browse Source
This commit is contained in:
Zuul 2018-08-15 22:58:31 +00:00 committed by Gerrit Code Review
commit 80f0fcc785
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/openstack_project/files/puppetmaster/groups.txt
View File

@ -3,7 +3,7 @@ afsadmin ~mirror-update\d+\.openstack\.org
afsdb afsdb*.openstack.org
cacti ~cacti\d+\.openstack\.org
ci-backup backup\d+.*\ci\.openstack\.org
disabled backup\d+.*\ci\.openstack\.org:wiki.openstack.org:bridge.openstack.org
disabled backup\d+.*\ci\.openstack\.org:wiki.openstack.org
eavesdrop ~eavesdrop\d*\.openstack\.org
elasticsearch ~elasticsearch0[1-7]\.openstack\.org
ethercalc ~ethercalc\d+\.openstack\.org
@ -30,3 +30,4 @@ paste ~paste\d*\.openstack\.org
adns ~adns\d*\.openstack\.org
ns ~ns\d*\.openstack\.org
futureparser ~review-dev\d*\.openstack\.org:~graphite\d*\.openstack\.org:~groups\d*\.openstack\.org:~groups-dev\d*\.openstack\.org:~etherpad-dev\d*\.openstack\.org:~ask-staging\d*\.openstack\.org:~codesearch\d*\.openstack\.org
puppet !bridge.openstack.org

2
playbooks/remote_puppet_else.yaml
View File

@ -1,4 +1,4 @@
- hosts: '!review:!git0*:!zuul-scheduler:!afs*:!baremetal*:!controller*:!compute*:!puppetmaster*:!disabled'
- hosts: 'puppet:!review:!git0*:!zuul-scheduler:!afs*:!baremetal*:!controller*:!compute*:!puppetmaster*:!disabled'
strategy: free
gather_facts: true
roles:

5
playbooks/roles/install-ansible/files/groups.yaml
View File

@ -6,12 +6,12 @@ groups:
afsdb: inventory_hostname|regex_match('afsdb.*openstack.org')
cacti: inventory_hostname|regex_match('cacti\d+\.openstack\.org')
ci-backup: inventory_hostname|regex_match('backup\d+.*\ci\.openstack\.org')
disabled: inventory_hostname.startswith('backup') or inventory_hostname.startswith('wiki') or inventory_hostname.startswith('bridge')
disabled: inventory_hostname.startswith('backup') or inventory_hostname.startswith('wiki')
eavesdrop: inventory_hostname.startswith('eavesdrop')
elasticsearch: inventory_hostname|regex_match('elasticsearch0[1-7]\.openstack\.org')
ethercalc: inventory_hostname.startswith('ethercalc')
files: inventory_hostname.startswith('files')
futureparser: inventory_hostname|regex_match('(review-dev\d*|groups\d*|groups-dev\d*)\.openstack\.org')
futureparser: inventory_hostname|regex_match('(review-dev\d*|groups\d*|groups-dev\d*|graphite\d*|etherpad-dev\d*|ask-staging\d*|codesearch\d*)\.openstack\.org')
git-loadbalancer: inventory_hostname|regex_match('~git(-fe\d+)?\.openstack\.org')
git-server: inventory_hostname|regex_match('~git\d+\.openstack\.org')
grafana: inventory_hostname.startswith('grafana')
@ -20,6 +20,7 @@ groups:
nodepool: inventory_hostname|regex_match('^(nodepool|nb|nl)')
ns: inventory_hostname.startswith('ns')
paste: inventory_hostname.startswith('paste')
puppet: not inventory_hostname.startswith('bridge')
review-dev: inventory_hostname|regex_match('review-dev\d+\.openstack\.org')
review: inventory_hostname|regex_match('review\d+\.openstack\.org')
status: inventory_hostname.startswith('status')