From bfb2963c20ec7cfed10b69a10a9e08e9525e7e50 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 27 Feb 2019 10:32:02 -0800
Subject: [PATCH] Cleanup old health server

We have replaced health.openstack.org with health01.openstack.org
(CNAMEd to by health.openstack.org). Remove reference to the old server.
Note that this updates references to health01.openstack.org to use the
full openstack.org to make it clear that this is not an opendev service.

Change-Id: Ifa21dc4a82258974857da2a843f67c5234736c47
---
 inventory/groups.yaml    | 8 ++++----
 inventory/openstack.yaml | 7 -------
 manifests/site.pp        | 3 +--
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/inventory/groups.yaml b/inventory/groups.yaml
index 28ea511628..76c4d546ad 100644
--- a/inventory/groups.yaml
+++ b/inventory/groups.yaml
@@ -53,7 +53,7 @@ groups:
     - graphite[0-9]*.open*.org
     - groups-dev[0-9]*.open*.org
     - groups[0-9]*.open*.org
-    - health[0-9]*.open*.org
+    - health[0-9]*.openstack.org
     - kdc[0-9]*.open*.org
     - lists-dev[0-9]*.open*.org
     - lists*.katacontainers.io
@@ -104,7 +104,7 @@ groups:
   groups:
     - groups*.open*.org
   health:
-    - health*.open*.org
+    - health[0-9]*.openstack.org
   kdc:
     - kdc[0-9]*.open*.org
   kubernetes:
@@ -157,7 +157,7 @@ groups:
     - graphite*.open*.org
     - groups-dev*.open*.org
     - groups*.open*.org
-    - health*.open*.org
+    - health[0-9]*.openstack.org
     - kdc[0-9]*.open*.org
     - lists*.katacontainers.io
     - lists*.open*.org
@@ -228,7 +228,7 @@ groups:
     - grafana[0-9]*.open*.org
     - graphite*.open*.org
     - groups*.open*.org
-    - health*.open*.org
+    - health[0-9]*.openstack.org
     - nb[0-9]*.open*.org
     - nl[0-9]*.open*.org
     - openstackid-dev*.openstack.org
diff --git a/inventory/openstack.yaml b/inventory/openstack.yaml
index bf7f3bc846..01c9fcfb80 100644
--- a/inventory/openstack.yaml
+++ b/inventory/openstack.yaml
@@ -280,13 +280,6 @@ all:
         region_name: DFW
       public_v4: 23.253.230.177
       public_v6: 2001:4800:7817:103:be76:4eff:fe06:9611
-    health.openstack.org:
-      ansible_host: 2001:4800:7815:102:be76:4eff:fe05:b6f
-      location:
-        cloud: openstackci-rax
-        region_name: DFW
-      public_v4: 162.242.156.70
-      public_v6: 2001:4800:7815:102:be76:4eff:fe05:b6f
     health01.openstack.org:
       ansible_host: 2001:4800:7817:104:be76:4eff:fe04:37bf
       location:
diff --git a/manifests/site.pp b/manifests/site.pp
index 9407d6d77e..afe944be04 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -116,9 +116,8 @@ node /^grafana\d*\.open.*\.org$/ {
   }
 }
 
-# Node-OS: trusty
 # Node-OS: xenial
-node /^health\d*\.open.*\.org$/ {
+node /^health\d*\.openstack\.org$/ {
   $group = "health"
   class { 'openstack_project::server': }
   class { 'openstack_project::openstack_health_api':