From 93b96193fcfaeddf21467fc62d4c62dc5a3d410f Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 4 Mar 2021 11:11:29 -0800
Subject: [PATCH] Replace ze02-04.openstack.org with ze02-04.opendev.org

These new servers are running focal and are ready to be configured as
executors. Once these are up and running I will ask
ze02-04.openstack.org to pause, then will stop them once they are
paused, and finally delete their servers.

Change-Id: I3c8377a68605d45da9759ce5b24e769a2427aff2
---
 hiera/common.yaml         |  6 +++---
 inventory/base/hosts.yaml | 24 ++++++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/hiera/common.yaml b/hiera/common.yaml
index 3126bc250a..13f094589a 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -303,9 +303,9 @@ cacti_hosts:
 - translate-dev.openstack.org
 - wiki.openstack.org
 - ze01.opendev.org
-- ze02.openstack.org
-- ze03.openstack.org
-- ze04.openstack.org
+- ze02.opendev.org
+- ze03.opendev.org
+- ze04.opendev.org
 - ze05.openstack.org
 - ze06.openstack.org
 - ze07.openstack.org
diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml
index cc205f6f27..d22aa905dd 100644
--- a/inventory/base/hosts.yaml
+++ b/inventory/base/hosts.yaml
@@ -754,27 +754,27 @@ all:
         region_name: DFW
       public_v4: 104.130.126.25
       public_v6: 2001:4800:7818:104:be76:4eff:fe04:52c4
-    ze02.openstack.org:
-      ansible_host: 104.239.140.238
+    ze02.opendev.org:
+      ansible_host: 104.239.144.167
       location:
         cloud: openstackci-rax
         region_name: DFW
-      public_v4: 104.239.140.238
-      public_v6: 2001:4800:7819:104:be76:4eff:fe04:c820
-    ze03.openstack.org:
-      ansible_host: 104.239.142.215
+      public_v4: 104.239.144.167
+      public_v6: 2001:4800:7818:104:be76:4eff:fe04:40fe
+    ze03.opendev.org:
+      ansible_host: 104.130.140.115
       location:
         cloud: openstackci-rax
         region_name: DFW
-      public_v4: 104.239.142.215
-      public_v6: 2001:4800:7818:104:be76:4eff:fe04:a4bf
-    ze04.openstack.org:
-      ansible_host: 23.253.245.60
+      public_v4: 104.130.140.115
+      public_v6: 2001:4800:7818:101:be76:4eff:fe04:4440
+    ze04.opendev.org:
+      ansible_host: 104.130.140.221
       location:
         cloud: openstackci-rax
         region_name: DFW
-      public_v4: 23.253.245.60
-      public_v6: 2001:4800:7818:101:be76:4eff:fe04:a6fb
+      public_v4: 104.130.140.221
+      public_v6: 2001:4800:7818:101:be76:4eff:fe04:4910
     ze05.openstack.org:
       ansible_host: 104.130.139.51
       location: