From b53a03df6840705f945367a73785a7cbbc29ad21 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 2 Nov 2018 11:37:47 -0700
Subject: [PATCH] Simplify nodepool groups.yaml membership

Replace all the explicit listings of nb01, nl01, etc with globs so that
we can launch new nodepool builders and nodepool launchers without
editing the groups file.

Change-Id: I3c32fb604109a3c65b2145b733fc0e2545e21045
---
 inventory/groups.yaml | 36 ++++++++----------------------------
 1 file changed, 8 insertions(+), 28 deletions(-)

diff --git a/inventory/groups.yaml b/inventory/groups.yaml
index 42f4be5286..524be056ee 100644
--- a/inventory/groups.yaml
+++ b/inventory/groups.yaml
@@ -99,22 +99,12 @@ groups:
   mirror:
     - mirror[0-9]*.*.*.openstack.org
   nodepool:
-    - nb01.openstack.org
-    - nb02.openstack.org
-    - nb03.openstack.org
-    - nl01.openstack.org
-    - nl02.openstack.org
-    - nl03.openstack.org
-    - nl04.openstack.org
+    - nb[0-9]*.openstack.org
+    - nl[0-9]*.openstack.org
   nodepool-builder:
-    - nb01.openstack.org
-    - nb02.openstack.org
-    - nb03.openstack.org
+    - nb[0-9]*.openstack.org
   nodepool-launcher:
-    - nl01.openstack.org
-    - nl02.openstack.org
-    - nl03.openstack.org
-    - nl04.openstack.org
+    - nl[0-9]*.openstack.org
   ns:
     - ns1.openstack.org
     - ns2.openstack.org
@@ -172,13 +162,8 @@ groups:
     - logstash[0-9]*.openstack.org
     - mirror-update01.openstack.org
     - mirror[0-9]*.*.*.openstack.org
-    - nb01.openstack.org
-    - nb02.openstack.org
-    - nb03.openstack.org
-    - nl01.openstack.org
-    - nl02.openstack.org
-    - nl03.openstack.org
-    - nl04.openstack.org
+    - nb[0-9]*.openstack.org
+    - nl[0-9]*.openstack.org
     - ns1.openstack.org
     - ns2.openstack.org
     - openstackid-dev.openstack.org
@@ -248,13 +233,8 @@ groups:
     - groups-dev.openstack.org
     - groups.openstack.org
     - health.openstack.org
-    - nb01.openstack.org
-    - nb02.openstack.org
-    - nb03.openstack.org
-    - nl01.openstack.org
-    - nl02.openstack.org
-    - nl03.openstack.org
-    - nl04.openstack.org
+    - nb[0-9]*.openstack.org
+    - nl[0-9]*.openstack.org
     - openstackid-dev.openstack.org
     - openstackid.org
     - paste01.openstack.org