From ce58c67b6e962955d95fab7f34c5bb851b092334 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Sun, 27 Jan 2019 17:04:56 +0000
Subject: [PATCH] Remove old storyboard-dev from inventory

The old Trusty-based storyboard-dev.openstack.org server has been
replaced by a new Xenial-based storyboard-dev01.opendev.org
instance. As the original is being deleted, remove it from the
inventory and tighten up our hostname match patterns accordingly.

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

diff --git a/inventory/groups.yaml b/inventory/groups.yaml
index ffd76693c0..64cb8d62fb 100644
--- a/inventory/groups.yaml
+++ b/inventory/groups.yaml
@@ -66,7 +66,7 @@ groups:
     - planet[0-9]*.open*.org
     - review-dev[0-9]*.open*.org
     - review[0-9]*.open*.org
-    - storyboard-dev[0-9]*.open*.org
+    - storyboard-dev[0-9]*.opendev.org
     - storyboard[0-9]*.open*.org
     - static[0-9]*.open*.org
     - status[0-9]*.open*.org
@@ -183,7 +183,7 @@ groups:
   storyboard:
     - storyboard*.open*.org
   storyboard-dev:
-    - storyboard-dev*.open*.org
+    - storyboard-dev[0-9]*.opendev.org
   subunit-worker:
     - subunit-worker[0-9]*.open*.org
   survey:
diff --git a/inventory/openstack.yaml b/inventory/openstack.yaml
index e7b71e75ec..53106d36ef 100644
--- a/inventory/openstack.yaml
+++ b/inventory/openstack.yaml
@@ -856,14 +856,6 @@ all:
       private_v4: 10.208.163.115
       public_v4: 23.253.234.105
       public_v6: 2001:4800:7817:103:be76:4eff:fe04:93f6
-    storyboard-dev.openstack.org:
-      ansible_host: 2001:4800:7815:102:be76:4eff:fe05:3f4c
-      location:
-        cloud: openstackci-rax
-        region_name: DFW
-      private_v4: 10.208.0.49
-      public_v4: 23.253.90.40
-      public_v6: 2001:4800:7815:102:be76:4eff:fe05:3f4c
     storyboard.openstack.org:
       ansible_host: 2001:4800:7815:103:be76:4eff:fe06:b5c
       location:
diff --git a/manifests/site.pp b/manifests/site.pp
index 117e5357a7..00f40ad89f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -590,7 +590,7 @@ node /^storyboard\d*\.open.*\.org$/ {
 # A machine to run Storyboard devel
 # Node-OS: trusty
 # Node-OS: xenial
-node /^storyboard-dev\d*\.open.*\.org$/ {
+node /^storyboard-dev\d+\.opendev\.org$/ {
   $group = "storyboard-dev"
   class { 'openstack_project::storyboard::dev':
     project_config_repo     => 'https://git.openstack.org/openstack-infra/project-config',