X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=site_type%2Fsriov-a13%2Ftemplates%2Fsoftware%2Fcharts%2Fkubernetes%2Fetcd%2Fetcd.j2;fp=site_type%2Fsriov%2Fairship-treasuremap%2Fsite%2Fairship-seaworthy%2Fsoftware%2Fcharts%2Fkubernetes%2Fetcd%2Fetcd.yaml;h=b99a105c2d1c2304038aa569dbdaff7670b2812d;hb=fbb206730195c6f03ded7658d08f1ef708ebf88b;hp=b32495ee2f0746015c5f464310409b7fc3f0f571;hpb=3395a537e26721ec33a80f66686ca932f9328722;p=yaml_builds.git

diff --git a/site_type/sriov/airship-treasuremap/site/airship-seaworthy/software/charts/kubernetes/etcd/etcd.yaml b/site_type/sriov-a13/templates/software/charts/kubernetes/etcd/etcd.j2
similarity index 54%
rename from site_type/sriov/airship-treasuremap/site/airship-seaworthy/software/charts/kubernetes/etcd/etcd.yaml
rename to site_type/sriov-a13/templates/software/charts/kubernetes/etcd/etcd.j2
index b32495e..b99a105 100644
--- a/site_type/sriov/airship-treasuremap/site/airship-seaworthy/software/charts/kubernetes/etcd/etcd.yaml
+++ b/site_type/sriov-a13/templates/software/charts/kubernetes/etcd/etcd.j2
@@ -25,24 +25,14 @@ metadata:
         path: .genesis.hostname
       dest:
         path: .values.nodes[0].name
+{% for server in yaml.masters %}
     - src:
         schema: pegleg/CommonAddresses/v1
         name: common-addresses
-        path: .masters[0].hostname
+        path: .masters[{{loop.index-1}}].hostname
       dest:
-        path: .values.nodes[1].name
-    - src:
-        schema: pegleg/CommonAddresses/v1
-        name: common-addresses
-        path: .masters[1].hostname
-      dest:
-        path: .values.nodes[2].name
-    - src:
-        schema: pegleg/CommonAddresses/v1
-        name: common-addresses
-        path: .masters[2].hostname
-      dest:
-        path: .values.nodes[3].name
+        path: .values.nodes[{{loop.index}}].name
+{% endfor %}
 
     # Certificate substitutions for the node names assembled on the above list.
     # NEWSITE-CHANGEME: Per above, the number of substitutions should not need
@@ -56,6 +46,8 @@ metadata:
     # 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 `cab23-r720-11` here.
+
+    # Genesis node {{yaml.genesis.name}}
     - src:
         schema: deckhand/Certificate/v1
         name: kubernetes-etcd-genesis
@@ -80,84 +72,34 @@ metadata:
         path: .
       dest:
         path: .values.nodes[0].tls.peer.key
+{% for server in yaml.masters %}
 
-    # master node 1 hostname - cab23-r720-12
+    # Master node {{loop.index}} hostname - {{server.name}}
     - src:
         schema: deckhand/Certificate/v1
-        name: kubernetes-etcd-cab23-r720-12
+        name: kubernetes-etcd-{{server.name}}
         path: .
       dest:
-        path: .values.nodes[1].tls.client.cert
+        path: .values.nodes[{{loop.index}}].tls.client.cert
     - src:
         schema: deckhand/CertificateKey/v1
-        name: kubernetes-etcd-cab23-r720-12
+        name: kubernetes-etcd-{{server.name}}
         path: .
       dest:
-        path: .values.nodes[1].tls.client.key
+        path: .values.nodes[{{loop.index}}].tls.client.key
     - src:
         schema: deckhand/Certificate/v1
-        name: kubernetes-etcd-cab23-r720-12-peer
+        name: kubernetes-etcd-{{server.name}}-peer
         path: .
       dest:
-        path: .values.nodes[1].tls.peer.cert
+        path: .values.nodes[{{loop.index}}].tls.peer.cert
     - src:
         schema: deckhand/CertificateKey/v1
-        name: kubernetes-etcd-cab23-r720-12-peer
+        name: kubernetes-etcd-{{server.name}}-peer
         path: .
       dest:
-        path: .values.nodes[1].tls.peer.key
-
-    # master node 2 hostname - cab23-r720-13
-    - src:
-        schema: deckhand/Certificate/v1
-        name: kubernetes-etcd-cab23-r720-13
-        path: .
-      dest:
-        path: .values.nodes[2].tls.client.cert
-    - src:
-        schema: deckhand/CertificateKey/v1
-        name: kubernetes-etcd-cab23-r720-13
-        path: .
-      dest:
-        path: .values.nodes[2].tls.client.key
-    - src:
-        schema: deckhand/Certificate/v1
-        name: kubernetes-etcd-cab23-r720-13-peer
-        path: .
-      dest:
-        path: .values.nodes[2].tls.peer.cert
-    - src:
-        schema: deckhand/CertificateKey/v1
-        name: kubernetes-etcd-cab23-r720-13-peer
-        path: $
-      dest:
-        path: .values.nodes[2].tls.peer.key
-
-    # master node 3 hostname - cab23-r720-14
-    - src:
-        schema: deckhand/Certificate/v1
-        name: kubernetes-etcd-cab23-r720-14
-        path: .
-      dest:
-        path: .values.nodes[3].tls.client.cert
-    - src:
-        schema: deckhand/CertificateKey/v1
-        name: kubernetes-etcd-cab23-r720-14
-        path: .
-      dest:
-        path: .values.nodes[3].tls.client.key
-    - src:
-        schema: deckhand/Certificate/v1
-        name: kubernetes-etcd-cab23-r720-14-peer
-        path: .
-      dest:
-        path: .values.nodes[3].tls.peer.cert
-    - src:
-        schema: deckhand/CertificateKey/v1
-        name: kubernetes-etcd-cab23-r720-14-peer
-        path: $
-      dest:
-        path: .values.nodes[3].tls.peer.key
+        path: .values.nodes[{{loop.index}}].tls.peer.key
+{% endfor %}
 
 data: {}
 ...