From 8346b9ac6f625fa63c8f4d08c1cdb6205523146a Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 27 Apr 2021 12:49:08 -0700
Subject: [PATCH] Add zk06.opendev.org to the zk cluster

This new zk06 instance will replace zk01 in the cluster.

Change-Id: Idb5ef47c80d6639744be361f0763b78f83327caf
---
 doc/source/nodepool.rst   |  4 ++--
 hiera/common.yaml         |  2 +-
 inventory/base/hosts.yaml | 24 +++++++-----------------
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/doc/source/nodepool.rst b/doc/source/nodepool.rst
index d7bfcaf69d..fa77ecb5c1 100644
--- a/doc/source/nodepool.rst
+++ b/doc/source/nodepool.rst
@@ -19,9 +19,9 @@ At a Glance
   * nb01.opendev.org
   * nb02.opendev.org
   * nb03.opendev.org
-  * zk01.openstack.org
   * zk04.opendev.org
   * zk05.opendev.org
+  * zk06.opendev.org
 :Puppet:
   * https://opendev.org/opendev/puppet-openstackci/src/branch/master/manifests/nodepool_builder.pp
 :Configuration:
@@ -51,7 +51,7 @@ Zookeeper
 =========
 
 Nodepool stores image metadata in ZooKeeper.  We have a three-node
-ZooKeeper cluster running on zk01.openstack.org - zk03.openstack.org.
+ZooKeeper cluster running on zk04.opendev.org - zk06.opendev.org.
 
 The Nodepool CLI should be sufficient to examine and alter any of the
 information stored in ZooKeeper.  However, in case advanced debugging
diff --git a/hiera/common.yaml b/hiera/common.yaml
index 162a66c12e..79e774eb3a 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -311,9 +311,9 @@ cacti_hosts:
 - ze10.opendev.org
 - ze11.opendev.org
 - ze12.opendev.org
-- zk01.openstack.org
 - zk04.opendev.org
 - zk05.opendev.org
+- zk06.opendev.org
 - zm01.opendev.org
 - zm02.opendev.org
 - zm03.opendev.org
diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml
index e905ed1d36..0374437cdd 100644
--- a/inventory/base/hosts.yaml
+++ b/inventory/base/hosts.yaml
@@ -815,13 +815,6 @@ all:
         region_name: DFW
       public_v4: 104.130.126.61
       public_v6: 2001:4800:7818:104:be76:4eff:fe04:5fdf
-    zk01.openstack.org:
-      ansible_host: 23.253.236.126
-      location:
-        cloud: openstackci-rax
-        region_name: DFW
-      public_v4: 23.253.236.126
-      public_v6: 2001:4800:7817:103:be76:4eff:fe04:e359
     zk04.opendev.org:
       ansible_host: 104.130.253.62
       location:
@@ -836,16 +829,13 @@ all:
         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.
-    #zk06.opendev.org:
-    #  ansible_host: 104.130.253.74
-    #  location:
-    #    cloud: openstackci-rax
-    #    region_name: DFW
-    #  public_v4: 104.130.253.74
-    #  public_v6: 2001:4800:7818:103:be76:4eff:fe04:3d08
+    zk06.opendev.org:
+      ansible_host: 104.130.253.74
+      location:
+        cloud: openstackci-rax
+        region_name: DFW
+      public_v4: 104.130.253.74
+      public_v6: 2001:4800:7818:103:be76:4eff:fe04:3d08
     zm01.opendev.org:
       ansible_host: 104.239.144.206
       location: