Streamline Seaworthy use of servers

Change-Id: Ic16a4f20b45c5037783627efe872cfe773f24716

global/software/config/versions.yaml

@@ -560,6 +560,7 @@ data:
       apiserver:
         anchor: gcr.io/google-containers/hyperkube-amd64:v1.12.9
         apiserver: gcr.io/google-containers/hyperkube-amd64:v1.12.9
+        key_rotate: gcr.io/google-containers/hyperkube-amd64:v1.12.9
       controller-manager:
         anchor: gcr.io/google-containers/hyperkube-amd64:v1.12.9
         controller_manager: gcr.io/google-containers/hyperkube-amd64:v1.12.9

site/seaworthy/baremetal/nodes.yaml

@@ -188,7 +188,7 @@ schema: 'drydock/BaremetalNode/v1'
 metadata:
   schema: 'metadata/Document/v1'
   # NEWSITE-CHANGEME: The next node's hostname
-  name: cab23-r720-17
+  name: cab23-r720-16
   layeringDefinition:
     abstract: false
     layer: site
@@ -197,19 +197,18 @@ data:
   # NEWSITE-CHANGEME: The next node's IPv4 addressing
   addressing:
     - network: oob
-      address: 10.23.104.17
+      address: 10.23.104.16
     - network: pxe
-      address: 10.23.20.17
+      address: 10.23.20.16
     - network: oam
-      address: 10.23.21.17
+      address: 10.23.21.16
     - network: storage
-      address: 10.23.23.17
+      address: 10.23.23.16
     - network: overlay
-      address: 10.23.24.17
+      address: 10.23.24.16
     - network: calico
-      address: 10.23.22.17
+      address: 10.23.22.16
   # NEWSITE-CHANGEME: The next node's host profile
-  # This is the one and only appearance of the "secondary" control plane profile
   host_profile: dp_r720
   metadata:
     # NEWSITE-CHANGEME: The next node's rack designation
@@ -223,7 +222,7 @@ schema: 'drydock/BaremetalNode/v1'
 metadata:
   schema: 'metadata/Document/v1'
   # NEWSITE-CHANGEME: The next node's hostname
-  name: cab23-r720-19
+  name: cab23-r720-17
   layeringDefinition:
     abstract: false
     layer: site
@@ -232,18 +231,19 @@ data:
   # NEWSITE-CHANGEME: The next node's IPv4 addressing
   addressing:
     - network: oob
-      address: 10.23.104.19
+      address: 10.23.104.17
     - network: pxe
-      address: 10.23.20.19
+      address: 10.23.20.17
     - network: oam
-      address: 10.23.21.19
+      address: 10.23.21.17
     - network: storage
-      address: 10.23.23.19
+      address: 10.23.23.17
     - network: overlay
-      address: 10.23.24.19
+      address: 10.23.24.17
     - network: calico
-      address: 10.23.22.19
+      address: 10.23.22.17
   # NEWSITE-CHANGEME: The next node's host profile
+  # This is the one and only appearance of the "secondary" control plane profile
   host_profile: dp_r720
   metadata:
     # NEWSITE-CHANGEME: The next node's rack designation

site/seaworthy/pki/pki-catalog.yaml

@@ -84,6 +84,14 @@ data:
             - 10.23.22.14
           groups:
             - system:nodes
+        - document_name: kubelet-cab23-r720-16
+          common_name: system:node:cab23-r720-16
+          hosts:
+            - cab23-r720-16
+            - 10.23.21.16
+            - 10.23.22.16
+          groups:
+            - system:nodes
         - document_name: kubelet-cab23-r720-17
           common_name: system:node:cab23-r720-17
           hosts:
@@ -92,14 +100,6 @@ data:
             - 10.23.22.17
           groups:
             - system:nodes
-        - document_name: kubelet-cab23-r720-19
-          common_name: system:node:cab23-r720-19
-          hosts:
-            - cab23-r720-19
-            - 10.23.21.19
-            - 10.23.22.19
-          groups:
-            - system:nodes
         # End node list
         - document_name: scheduler
           description: Service certificate for Kubernetes scheduler

site/seaworthy/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml

@@ -62,11 +62,11 @@ data:
               conf:
                 storage:
                   failure_domain_name: "cab23_rack_1"
-            - name: cab23-r720-17
+            - name: cab23-r720-16
               conf:
                 storage:
                   failure_domain_name: "cab23_rack_2"
-            - name: cab23-r720-19
+            - name: cab23-r720-17
               conf:
                 storage:
                   failure_domain_name: "cab23_rack_3"

tools/gate/seaworthy/Jenkinsfile

@@ -30,8 +30,8 @@ GENESIS_CEPH_DISKS = ['b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k']
 IPMI_IPS = ['10.23.104.12',
             '10.23.104.13',
             '10.23.104.14',
-            '10.23.104.17',
-            '10.23.104.19']
+            '10.23.104.16',
+            '10.23.104.17']
 
 AIRSHIP_MANIFESTS_REPO = 'https://review.opendev.org/airship/treasuremap'