From 5a75bc9c962e1d4f25bf03ffddcba0cf324b3e8f Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 22 Jan 2019 22:14:33 +0000
Subject: [PATCH] Flexible instance naming for openstackid-dev

Use group variables and a node name pattern to divorce the
openstackid-dev service from the instance name of the server which
provides it. Also update the inventory matches to be consistent with
the pattern in the global site manifest.

Change-Id: I335f7ebaa5a446a83a4725bbcc0240f91cd14341
---
 inventory/groups.yaml | 4 ++--
 manifests/site.pp     | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/inventory/groups.yaml b/inventory/groups.yaml
index 34656174ee..ffd76693c0 100644
--- a/inventory/groups.yaml
+++ b/inventory/groups.yaml
@@ -149,7 +149,7 @@ groups:
     - mirror[0-9]*.open*.org
     - nb[0-9]*.open*.org
     - nl[0-9]*.open*.org
-    - openstackid-dev*.open*.org
+    - openstackid-dev*.openstack.org
     - openstackid.org
     - paste[0-9]*.open*.org
     - pbx*.open*.org
@@ -207,7 +207,7 @@ groups:
     - health*.open*.org
     - nb[0-9]*.open*.org
     - nl[0-9]*.open*.org
-    - openstackid-dev*.open*.org
+    - openstackid-dev*.openstack.org
     - openstackid.org
     - paste[0-9]*.open*.org
     - planet[0-9]*.open*.org
diff --git a/manifests/site.pp b/manifests/site.pp
index 48f2df7176..4ed72c5a94 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1031,7 +1031,8 @@ node 'openstackid.org' {
 }
 
 # Node-OS: xenial
-node 'openstackid-dev.openstack.org' {
+node /^openstackid-dev\d*.openstack\.org$/ {
+  $group = "openstackid-dev"
   class { 'openstack_project::openstackid_dev':
     site_admin_password         => hiera('openstackid_dev_site_admin_password'),
     id_mysql_host               => hiera('openstackid_dev_id_mysql_host', 'localhost'),