From ece14bbfb08424303502ed329aaa7e76cea13981 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Tue, 2 Jul 2019 16:35:59 +1000
Subject: [PATCH] Add mirror-update01.opendev.org server

Add the new mirror-update server as a follow-on to
I525ac18b55f0e11b0a541b51fa97ee5d6512bf70.

Also ensure that the new mirror server isn't in the puppet groups by
only matching the openstack.org one.

Also remove from the afsadmin group.  This group is only used for
keytabs stored on bridge.o.o.  I don't think that we need group for
the keytabs -- a keytab should only ever be in use on one host at a
time, so we are better off keeping the keytabs in a specific host_var
for the host they are used on, rather than being in a group and
possibly deployed on servers where they are not used.

Depends-On: https://review.opendev.org/668610
Change-Id: Icda92bb234adc00f6718c1c656e8f069ce2704c4
---
 inventory/groups.yaml    | 6 +++---
 inventory/openstack.yaml | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/inventory/groups.yaml b/inventory/groups.yaml
index 62e82cf6c9..f16d4f4df0 100644
--- a/inventory/groups.yaml
+++ b/inventory/groups.yaml
@@ -10,7 +10,7 @@ groups:
     - ze[0-9]*.open*.org
     - afsdb*.open*.org
     - afs[0-9]*.open*.org
-  afsadmin: mirror-update[0-9]*.open*.org
+  afsadmin: mirror-update[0-9]*.openstack.org
   afsdb: afsdb[0-9]*.open*.org
   ask: ask*.open*.org
   cacti: cacti[0-9]*.open*.org
@@ -111,7 +111,7 @@ groups:
     - lists*.open*.org
     - logstash-worker[0-9]*.open*.org
     - logstash[0-9]*.open*.org
-    - mirror-update[0-9]*.open*.org
+    - mirror-update[0-9]*.openstack.org
     - mirror[0-9]*.openstack.org
     - nb[0-9]*.open*.org
     - nl[0-9]*.open*.org
@@ -161,7 +161,7 @@ groups:
     - lists-dev[0-9]*.open*.org
     - logstash-worker[0-9]*.open*.org
     - logstash[0-9]*.open*.org
-    - mirror-update[0-9]*.open*.org
+    - mirror-update[0-9]*.openstack.org
     - ^mirror[0-9].*\..*\.(?!linaro|linaro-london|arm64ci).*\.openstack\.org
     - ^nb(?!03)[0-9]*\.open.*\.org
     - nl[0-9]*.open*.org
diff --git a/inventory/openstack.yaml b/inventory/openstack.yaml
index 27c455ecbf..905b838d53 100644
--- a/inventory/openstack.yaml
+++ b/inventory/openstack.yaml
@@ -419,6 +419,13 @@ all:
         region_name: DFW
       public_v4: 104.239.141.90
       public_v6: 2001:4800:7819:104:be76:4eff:fe04:935b
+    mirror-update01.opendev.org:
+      ansible_host: 2001:4800:7818:103:be76:4eff:fe04:9967
+      location:
+        cloud: openstackci-rax
+        region_name: DFW
+      public_v4: 104.130.137.130
+      public_v6: 2001:4800:7818:103:be76:4eff:fe04:9967
     mirror-update01.openstack.org:
       ansible_host: 2001:4800:7818:103:be76:4eff:fe04:5f3a
       location: