From 245609bc952f0ec9e56daca7b08039b8fe8e5754 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sat, 11 Aug 2018 07:01:00 -0500 Subject: [PATCH] Remove bridge from disabled and add puppet group Instead of just having bridge be disabled, make a puppet group that it's not a part of and switch the remote_puppet_else playbook to use that. Change-Id: Ifb96ce483fc5675d095723bda70242a425bdc619 --- modules/openstack_project/files/puppetmaster/groups.txt | 3 ++- playbooks/remote_puppet_else.yaml | 2 +- playbooks/roles/install-ansible/files/groups.yaml | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/openstack_project/files/puppetmaster/groups.txt b/modules/openstack_project/files/puppetmaster/groups.txt index 1b32fa4aba..c7c5dddd97 100644 --- a/modules/openstack_project/files/puppetmaster/groups.txt +++ b/modules/openstack_project/files/puppetmaster/groups.txt @@ -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 diff --git a/playbooks/remote_puppet_else.yaml b/playbooks/remote_puppet_else.yaml index 71266005d2..a00a1fa84b 100644 --- a/playbooks/remote_puppet_else.yaml +++ b/playbooks/remote_puppet_else.yaml @@ -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: diff --git a/playbooks/roles/install-ansible/files/groups.yaml b/playbooks/roles/install-ansible/files/groups.yaml index f9e58c3c38..f45136ec00 100644 --- a/playbooks/roles/install-ansible/files/groups.yaml +++ b/playbooks/roles/install-ansible/files/groups.yaml @@ -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')