From 08a553f529588703435a4e2396e12d1c1abf1058 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Sat, 16 Feb 2019 18:00:10 +0000
Subject: [PATCH] Clean up after StoryBoard replacement maintenance

Now that both staging and production storyboard servers are running
on enumerated Xenial servers in opendev.org, remove the old
inventory entry for the production server, clear out testing hints
for trusty and tighten up the inventory globs and node regular
expressions accordingly. Also get them swapped into cacti in place
of the old production server entry.

Change-Id: I5e66abb95751f69a337434e08d09dcc3b107e123
---
 hiera/common.yaml        |  3 ++-
 inventory/groups.yaml    | 10 ++++++----
 inventory/openstack.yaml |  7 -------
 manifests/site.pp        |  4 +---
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/hiera/common.yaml b/hiera/common.yaml
index 04b8c4221a..714c44eb88 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -318,7 +318,8 @@ cacti_hosts:
 - review.openstack.org
 - static.openstack.org
 - status01.openstack.org
-- storyboard.openstack.org
+- storyboard01.opendev.org
+- storyboard-dev01.opendev.org
 - subunit-worker01.openstack.org
 - subunit-worker02.openstack.org
 - translate.openstack.org
diff --git a/inventory/groups.yaml b/inventory/groups.yaml
index 8e8d183716..cf280089a0 100644
--- a/inventory/groups.yaml
+++ b/inventory/groups.yaml
@@ -66,7 +66,7 @@ groups:
     - review-dev[0-9]*.open*.org
     - review[0-9]*.open*.org
     - storyboard-dev[0-9]*.opendev.org
-    - storyboard[0-9]*.open*.org
+    - storyboard[0-9]*.opendev.org
     - static[0-9]*.open*.org
     - status[0-9]*.open*.org
     - subunit-worker[0-9]*.open*.org
@@ -166,7 +166,8 @@ groups:
     - review[0-9]*.open*.org
     - static*.open*.org
     - status*.open*.org
-    - storyboard*.open*.org
+    - storyboard-dev[0-9]*.opendev.org
+    - storyboard[0-9]*.opendev.org
     - subunit-worker[0-9]*.open*.org
     - survey[0-9]*.open*.org
     - translate-dev[0-9]*.open*.org
@@ -192,7 +193,7 @@ groups:
   status:
     - status*.open*.org
   storyboard:
-    - storyboard*.open*.org
+    - storyboard[0-9]*.opendev.org
   storyboard-dev:
     - storyboard-dev[0-9]*.opendev.org
   subunit-worker:
@@ -226,7 +227,8 @@ groups:
     - refstack*.open*.org
     - static*.open*.org
     - status*.open*.org
-    - storyboard*.open*.org
+    - storyboard-dev[0-9]*.opendev.org
+    - storyboard[0-9]*.opendev.org
     - survey[0-9]*.open*.org
     - translate-dev[0-9]*.open*.org
     - translate[0-9]*.open*.org
diff --git a/inventory/openstack.yaml b/inventory/openstack.yaml
index bcc6a39011..d6f0338b65 100644
--- a/inventory/openstack.yaml
+++ b/inventory/openstack.yaml
@@ -807,13 +807,6 @@ all:
         region_name: DFW
       public_v4: 162.209.77.101
       public_v6: 2001:4800:7818:103:be76:4eff:fe04:976a
-    storyboard.openstack.org:
-      ansible_host: 2001:4800:7815:103:be76:4eff:fe06:b5c
-      location:
-        cloud: openstackci-rax
-        region_name: DFW
-      public_v4: 23.253.85.155
-      public_v6: 2001:4800:7815:103:be76:4eff:fe06:b5c
     subunit-worker01.openstack.org:
       ansible_host: 2001:4800:7822:102:be76:4eff:fe05:1751
       location:
diff --git a/manifests/site.pp b/manifests/site.pp
index b76317ca58..00d15a691e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -575,9 +575,8 @@ node /^refstack\d*\.open.*\.org$/ {
 }
 
 # A machine to run Storyboard
-# Node-OS: trusty
 # Node-OS: xenial
-node /^storyboard\d*\.open.*\.org$/ {
+node /^storyboard\d+\.opendev\.org$/ {
   $group = "storyboard"
   class { 'openstack_project::storyboard':
     project_config_repo     => 'https://git.openstack.org/openstack-infra/project-config',
@@ -606,7 +605,6 @@ node /^storyboard\d*\.open.*\.org$/ {
 }
 
 # A machine to run Storyboard devel
-# Node-OS: trusty
 # Node-OS: xenial
 node /^storyboard-dev\d+\.opendev\.org$/ {
   $group = "storyboard-dev"