Add zk05.opendev.org to the zk cluster

This new zk05 instance will replace zk02 in the cluster.

Change-Id: I425708d6a241ad7a90266e5ba5b6ed544bfd5ff0

doc/source/nodepool.rst

@@ -20,8 +20,8 @@ At a Glance
   * nb02.opendev.org
   * nb03.opendev.org
   * zk01.openstack.org
-  * zk02.openstack.org
   * zk04.opendev.org
+  * zk05.opendev.org
 :Puppet:
   * https://opendev.org/opendev/puppet-openstackci/src/branch/master/manifests/nodepool_builder.pp
 :Configuration:

hiera/common.yaml

@@ -312,8 +312,8 @@ cacti_hosts:
 - ze11.opendev.org
 - ze12.opendev.org
 - zk01.openstack.org
-- zk02.openstack.org
 - zk04.opendev.org
+- zk05.opendev.org
 - zm01.opendev.org
 - zm02.opendev.org
 - zm03.opendev.org

inventory/base/hosts.yaml

@@ -822,13 +822,6 @@ all:
         region_name: DFW
       public_v4: 23.253.236.126
       public_v6: 2001:4800:7817:103:be76:4eff:fe04:e359
-    zk02.openstack.org:
-      ansible_host: 172.99.117.32
-      location:
-        cloud: openstackci-rax
-        region_name: DFW
-      public_v4: 172.99.117.32
-      public_v6: 2001:4800:7821:105:be76:4eff:fe04:d599
     zk04.opendev.org:
       ansible_host: 104.130.253.62
       location:
@@ -836,16 +829,16 @@ all:
         region_name: DFW
       public_v4: 104.130.253.62
       public_v6: 2001:4800:7818:103:be76:4eff:fe03:e80d
+    zk05.opendev.org:
+      ansible_host: 104.130.253.65
+      location:
+        cloud: openstackci-rax
+        region_name: DFW
+      public_v4: 104.130.253.65
+      public_v6: 2001:4800:7818:103:be76:4eff:fe03:5ef8
     # Clarkb recording these here for ease of use later, but they need to be
     # added to the inventory in a controlled manner as we rotate cluster
     # members in and out.
-    #zk05.opendev.org:
-    #  ansible_host: 104.130.253.65
-    #  location:
-    #    cloud: openstackci-rax
-    #    region_name: DFW
-    #  public_v4: 104.130.253.65
-    #  public_v6: 2001:4800:7818:103:be76:4eff:fe03:5ef8
     #zk06.opendev.org:
     #  ansible_host: 104.130.253.74
     #  location: