Move genesis from pod17-jump to pod17-node1

Adjust installation to comply with Pharos specification
http://artifacts.opnfv.org/pharos/colorado/docs/specification/index.html

The jump host is intended to serve as a node where installer runs.
This then is used as a worker node for Jenkins.

This patchset re-configures genesis to move to pod17-node1, and
reduces compute nodes from 3 to 2.

Change-Id: Ie5f65ad7cc0e6f688c913705babab6dc25925b4e
Signed-off-by: Kaspars Skels <kaspars.skels@att.com>

2 files changed, 26 insertions, 26 deletions

diff --git a/site/intel-pod17/software/charts/kubernetes/container-networking/etcd.yaml b/site/intel-pod17/software/charts/kubernetes/container-networking/etcd.yaml
index 00053a4..6bbade4 100644
--- a/site/intel-pod17/software/charts/kubernetes/container-networking/etcd.yaml
+++ b/site/intel-pod17/software/charts/kubernetes/container-networking/etcd.yaml
@@ -45,80 +45,80 @@ metadata:
     # environment. The ordering is important (Genesis is index 0, then master
     # nodes in the order they are specified in common-addresses).
 
-    # Genesis hostname - pod17-jump
+    # Genesis hostname - pod17-node1
     - src:
         schema: deckhand/Certificate/v1
-        name: calico-etcd-pod17-jump
+        name: calico-etcd-pod17-node1
         path: .
       dest:
         path: .values.nodes[0].tls.client.cert
     - src:
         schema: deckhand/CertificateKey/v1
-        name: calico-etcd-pod17-jump
+        name: calico-etcd-pod17-node1
         path: .
       dest:
         path: .values.nodes[0].tls.client.key
     - src:
         schema: deckhand/Certificate/v1
-        name: calico-etcd-pod17-jump-peer
+        name: calico-etcd-pod17-node1-peer
         path: .
       dest:
         path: .values.nodes[0].tls.peer.cert
     - src:
         schema: deckhand/CertificateKey/v1
-        name: calico-etcd-pod17-jump-peer
+        name: calico-etcd-pod17-node1-peer
         path: .
       dest:
         path: .values.nodes[0].tls.peer.key
 
-    # master node 1 hostname - pod17-node1
+    # master node 1 hostname - pod17-node2
     - src:
         schema: deckhand/Certificate/v1
-        name: calico-etcd-pod17-node1
+        name: calico-etcd-pod17-node2
         path: .
       dest:
         path: .values.nodes[1].tls.client.cert
     - src:
         schema: deckhand/CertificateKey/v1
-        name: calico-etcd-pod17-node1
+        name: calico-etcd-pod17-node2
         path: .
       dest:
         path: .values.nodes[1].tls.client.key
     - src:
         schema: deckhand/Certificate/v1
-        name: calico-etcd-pod17-node1-peer
+        name: calico-etcd-pod17-node2-peer
         path: .
       dest:
         path: .values.nodes[1].tls.peer.cert
     - src:
         schema: deckhand/CertificateKey/v1
-        name: calico-etcd-pod17-node1-peer
+        name: calico-etcd-pod17-node2-peer
         path: .
       dest:
         path: .values.nodes[1].tls.peer.key
 
-    # master node 2 hostname - pod17-node2
+    # master node 2 hostname - pod17-node3
     - src:
         schema: deckhand/Certificate/v1
-        name: calico-etcd-pod17-node2
+        name: calico-etcd-pod17-node3
         path: .
       dest:
         path: .values.nodes[2].tls.client.cert
     - src:
         schema: deckhand/CertificateKey/v1
-        name: calico-etcd-pod17-node2
+        name: calico-etcd-pod17-node3
         path: .
       dest:
         path: .values.nodes[2].tls.client.key
     - src:
         schema: deckhand/Certificate/v1
-        name: calico-etcd-pod17-node2-peer
+        name: calico-etcd-pod17-node3-peer
         path: .
       dest:
         path: .values.nodes[2].tls.peer.cert
     - src:
         schema: deckhand/CertificateKey/v1
-        name: calico-etcd-pod17-node2-peer
+        name: calico-etcd-pod17-node3-peer
         path: .
       dest:
         path: .values.nodes[2].tls.peer.key
diff --git a/site/intel-pod17/software/charts/kubernetes/etcd/etcd.yaml b/site/intel-pod17/software/charts/kubernetes/etcd/etcd.yaml
index 365b3d0..91b6ed2 100644
--- a/site/intel-pod17/software/charts/kubernetes/etcd/etcd.yaml
+++ b/site/intel-pod17/software/charts/kubernetes/etcd/etcd.yaml
@@ -49,7 +49,7 @@ metadata:
     # *NOTE: This is an exception in that `genesis` is not the hostname of the
     # genesis node, but `genesis` is reference here in the certificate names
     # because of certain Promenade assumptions that may be addressed in the
-    # future. Therefore `genesis` is used instead of `pod17-jump` here.
+    # future. Therefore `genesis` is used instead of `pod17-node1` here.
     - src:
         schema: deckhand/Certificate/v1
         name: kubernetes-etcd-genesis
@@ -75,54 +75,54 @@ metadata:
       dest:
         path: .values.nodes[0].tls.peer.key
 
-    # master node 1 hostname - pod17-node1
+    # master node 1 hostname - pod17-node2
     - src:
         schema: deckhand/Certificate/v1
-        name: kubernetes-etcd-pod17-node1
+        name: kubernetes-etcd-pod17-node2
         path: .
       dest:
         path: .values.nodes[1].tls.client.cert
     - src:
         schema: deckhand/CertificateKey/v1
-        name: kubernetes-etcd-pod17-node1
+        name: kubernetes-etcd-pod17-node2
         path: .
       dest:
         path: .values.nodes[1].tls.client.key
     - src:
         schema: deckhand/Certificate/v1
-        name: kubernetes-etcd-pod17-node1-peer
+        name: kubernetes-etcd-pod17-node2-peer
         path: .
       dest:
         path: .values.nodes[1].tls.peer.cert
     - src:
         schema: deckhand/CertificateKey/v1
-        name: kubernetes-etcd-pod17-node1-peer
+        name: kubernetes-etcd-pod17-node2-peer
         path: .
       dest:
         path: .values.nodes[1].tls.peer.key
 
-    # master node 2 hostname - pod17-node2
+    # master node 2 hostname - pod17-node3
     - src:
         schema: deckhand/Certificate/v1
-        name: kubernetes-etcd-pod17-node2
+        name: kubernetes-etcd-pod17-node3
         path: .
       dest:
         path: .values.nodes[2].tls.client.cert
     - src:
         schema: deckhand/CertificateKey/v1
-        name: kubernetes-etcd-pod17-node2
+        name: kubernetes-etcd-pod17-node3
         path: .
       dest:
         path: .values.nodes[2].tls.client.key
     - src:
         schema: deckhand/Certificate/v1
-        name: kubernetes-etcd-pod17-node2-peer
+        name: kubernetes-etcd-pod17-node3-peer
         path: .
       dest:
         path: .values.nodes[2].tls.peer.cert
     - src:
         schema: deckhand/CertificateKey/v1
-        name: kubernetes-etcd-pod17-node2-peer
+        name: kubernetes-etcd-pod17-node3-peer
         path: $
       dest:
         path: .values.nodes[2].tls.peer.key