From 679210deb2334df12f03e50dfa54af0e37e1a3cc Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Wed, 19 Dec 2018 20:25:44 +0000
Subject: [PATCH] Use regexes for servers in global site manifest

In preparation for rebuilding many openstack.org servers in the
opendev.org domain and generally supporting server names with
ordinal suffixes, switch them to regular expression matches in the
global site manifest.

Change-Id: I29c7f5dce90d25ec735fc6a841dbd18f51b0b6f3
---
 manifests/site.pp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 1c072f3f3c..d54bd7efc2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,7 +19,7 @@ node default {
 # Long lived servers:
 #
 # Node-OS: xenial
-node 'review01.openstack.org' {
+node /^review\d*\.openstack\.org$/ {
   $group = "review"
 
   class { 'openstack_project::server': }
@@ -368,7 +368,7 @@ node /^subunit-worker\d+\.openstack\.org$/ {
 }
 
 # Node-OS: xenial
-node /^elasticsearch0[1-7]\.openstack\.org$/ {
+node /^elasticsearch\d+\.openstack\.org$/ {
   $group = "elasticsearch"
   class { 'openstack_project::server': }
   class { 'openstack_project::elasticsearch_node':
@@ -1023,7 +1023,7 @@ node /^zm\d+.openstack\.org$/ {
 }
 
 # Node-OS: trusty
-node 'pbx.openstack.org' {
+node /^pbx\d*\.openstack\.org$/ {
   class { 'openstack_project::server': }
   class { 'openstack_project::pbx':
     sip_providers => [
@@ -1076,7 +1076,7 @@ node 'openstackid.org' {
 }
 
 # Node-OS: trusty
-node 'openstackid-dev.openstack.org' {
+node /^openstackid-dev\d*\.openstack\.org$/ {
   class { 'openstack_project::openstackid_dev':
     site_admin_password         => hiera('openstackid_dev_site_admin_password'),
     id_mysql_host               => hiera('openstackid_dev_id_mysql_host', 'localhost'),
@@ -1110,14 +1110,14 @@ node 'single-node-ci.test.only' {
 }
 
 # Node-OS: trusty
-node 'kdc01.openstack.org' {
+node /^kdc01\.openstack\.org$/ {
   class { 'openstack_project::server': }
 
   class { 'openstack_project::kdc': }
 }
 
 # Node-OS: xenial
-node 'kdc04.openstack.org' {
+node /^kdc04\.openstack\.org$/ {
   class { 'openstack_project::server': }
 
   class { 'openstack_project::kdc':
@@ -1126,7 +1126,7 @@ node 'kdc04.openstack.org' {
 }
 
 # Node-OS: trusty
-node 'afsdb01.openstack.org' {
+node /^afsdb01\.openstack\.org$/ {
   $group = "afsdb"
 
   class { 'openstack_project::server':
@@ -1160,7 +1160,7 @@ node /^afs.*\..*\.openstack\.org$/ {
 }
 
 # Node-OS: trusty
-node 'ask.openstack.org' {
+node /^ask\d*\.openstack\.org$/ {
 
   class { 'openstack_project::server': }
 
@@ -1175,7 +1175,7 @@ node 'ask.openstack.org' {
 }
 
 # Node-OS: trusty
-node 'ask-staging.openstack.org' {
+node /^ask-staging\d*\.openstack\.org$/ {
   class { 'openstack_project::server': }
 
   class { 'openstack_project::ask_staging':