X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=templates%2Fpki%2Fpki-catalog.j2;fp=templates%2Faic-clcp-manifests%2Fpki%2Fpki-catalog.j2;h=17e18f1f3ffccd1d099e3a00387a820fb8035e1f;hb=refs%2Fchanges%2F69%2F369%2F1;hp=b6dd2582521be1e7cace727b17a8e737e2760d97;hpb=d743ec6c91f97cc9f5b944a8d0a609883440b14e;p=yaml_builds.git

diff --git a/templates/aic-clcp-manifests/pki/pki-catalog.j2 b/templates/pki/pki-catalog.j2
similarity index 87%
rename from templates/aic-clcp-manifests/pki/pki-catalog.j2
rename to templates/pki/pki-catalog.j2
index b6dd258..17e18f1 100644
--- a/templates/aic-clcp-manifests/pki/pki-catalog.j2
+++ b/templates/pki/pki-catalog.j2
@@ -1,6 +1,6 @@
 ---
 ##############################################################################
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.          #
+# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.        #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License.                   #
@@ -43,7 +43,7 @@ data:
             - {{yaml.genesis.name}}
             - {{yaml.genesis.host}}
             - {{yaml.genesis.ksn}}
-            - {{yaml.genesis.storage}}
+            - {{yaml.genesis.pxe}}
           groups:
             - system:nodes
         - document_name: kubelet-{{yaml.genesis.name}}
@@ -52,17 +52,28 @@ data:
             - {{yaml.genesis.name}}
             - {{yaml.genesis.host}}
             - {{yaml.genesis.ksn}}
-            - {{yaml.genesis.storage}}
+            - {{yaml.genesis.pxe}}
           groups:
             - system:nodes
-{% for server in yaml.servers %}
+{% for server in yaml.masters %}
         - document_name: kubelet-{{ server.name }}
           common_name: system:node:{{ server.name }}
           hosts:
             - {{server.name}}
             - {{server.host}}
             - {{server.ksn}}
-            - {{server.storage}}
+            - {{server.pxe}}
+          groups:
+            - system:nodes
+{% endfor %}
+{% for server in yaml.workers %}
+        - document_name: kubelet-{{ server.name }}
+          common_name: system:node:{{ server.name }}
+          hosts:
+            - {{server.name}}
+            - {{server.host}}
+            - {{server.ksn}}
+            - {{server.pxe}}
           groups:
             - system:nodes
 {% endfor %}
@@ -96,7 +107,7 @@ data:
             - {{yaml.genesis.name}}
             - {{yaml.genesis.host}}
             - {{yaml.genesis.ksn}}
-            - {{yaml.genesis.storage}}
+            - {{yaml.genesis.pxe}}
             - 127.0.0.1
             - localhost
             - kubernetes-etcd.kube-system.svc.cluster.local
@@ -107,19 +118,19 @@ data:
             - {{yaml.genesis.name}}
             - {{yaml.genesis.host}}
             - {{yaml.genesis.ksn}}
-            - {{yaml.genesis.storage}}
+            - {{yaml.genesis.pxe}}
             - 127.0.0.1
             - localhost
             - kubernetes-etcd.kube-system.svc.cluster.local
             - {{yaml.kubernetes.etcd_service_ip}}
-{% for server in yaml.servers %}
+{% for server in yaml.masters %}
         - document_name: kubernetes-etcd-{{ server.name }}
           common_name: kubernetes-etcd-{{ server.name }}
           hosts:
             - {{ server.name }}
             - {{server.host}}
             - {{server.ksn}}
-            - {{server.storage}}
+            - {{server.pxe}}
             - 127.0.0.1
             - localhost
             - kubernetes-etcd.kube-system.svc.cluster.local
@@ -133,7 +144,7 @@ data:
             - {{yaml.genesis.name}}
             - {{yaml.genesis.host}}
             - {{yaml.genesis.ksn}}
-            - {{yaml.genesis.storage}}
+            - {{yaml.genesis.pxe}}
             - 127.0.0.1
             - localhost
             - kubernetes-etcd.kube-system.svc.cluster.local
@@ -144,19 +155,19 @@ data:
             - {{yaml.genesis.name}}
             - {{yaml.genesis.host}}
             - {{yaml.genesis.ksn}}
-            - {{yaml.genesis.storage}}
+            - {{yaml.genesis.pxe}}
             - 127.0.0.1
             - localhost
             - kubernetes-etcd.kube-system.svc.cluster.local
             - {{yaml.kubernetes.etcd_service_ip}}
-{% for server in yaml.servers %}
+{% for server in yaml.masters %}
         - document_name: kubernetes-etcd-{{server.name}}-peer
           common_name: kubernetes-etcd-{{server.name}}-peer
           hosts:
             - {{server.name}}
             - {{server.host}}
             - {{server.ksn}}
-            - {{server.storage}}
+            - {{server.pxe}}
             - 127.0.0.1
             - localhost
             - kubernetes-etcd.kube-system.svc.cluster.local
@@ -174,18 +185,18 @@ data:
             - {{yaml.genesis.name}}
             - {{yaml.genesis.host}}
             - {{yaml.genesis.ksn}}
-            - {{yaml.genesis.storage}}
+            - {{yaml.genesis.pxe}}
             - 127.0.0.1
             - localhost
             - 10.96.232.136
-{% for server in yaml.servers %}
+{% for server in yaml.masters %}
         - document_name: calico-etcd-{{server.name}}
           common_name: calico-etcd-{{server.name}}
           hosts:
             - {{server.name}}
             - {{server.host}}
             - {{server.ksn}}
-            - {{server.storage}}
+            - {{server.pxe}}
             - 127.0.0.1
             - localhost
             - 10.96.232.136
@@ -201,22 +212,24 @@ data:
             - {{yaml.genesis.name}}
             - {{yaml.genesis.host}}
             - {{yaml.genesis.ksn}}
-            - {{yaml.genesis.storage}}
+            - {{yaml.genesis.pxe}}
             - 127.0.0.1
             - localhost
             - 10.96.232.136
-{% for server in yaml.servers %}
+{% for server in yaml.masters %}
         - document_name: calico-etcd-{{server.name}}-peer
           common_name: calico-etcd-{{server.name}}-peer
           hosts:
             - {{server.name}}
             - {{server.host}}
             - {{server.ksn}}
-            - {{server.storage}}
+            - {{server.pxe}}
             - 127.0.0.1
             - localhost
             - 10.96.232.136
 {% endfor %}
+        - document_name: calico-node-peer
+          common_name: calcico-node-peer
   keypairs:
     - name: service-account
       description: Service account signing key for use by Kubernetes controller-manager.