From 9cc99d4b478c450846a76faa861b3dd3cd32b923 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Tue, 16 Jan 2018 23:40:48 +0000 Subject: [PATCH] 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 --- playbooks/remote_puppet_else.yaml | 2 +- playbooks/remote_puppet_git.yaml | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/playbooks/remote_puppet_else.yaml b/playbooks/remote_puppet_else.yaml index 1c6467ab0c..736775b617 100644 --- a/playbooks/remote_puppet_else.yaml +++ b/playbooks/remote_puppet_else.yaml @@ -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: diff --git a/playbooks/remote_puppet_git.yaml b/playbooks/remote_puppet_git.yaml index 612e5317d4..3519868b6c 100644 --- a/playbooks/remote_puppet_git.yaml +++ b/playbooks/remote_puppet_git.yaml @@ -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: