commit 7acc4c658a0426441253c6388e88a2255fab6ed6
author ashestakov <ashestakov@mirantis.com> Tue Feb 27 14:23:05 2018 +0000
committer Andrey Shestakov <ashestakov@mirantis.com> Fri Mar 02 09:54:22 2018 +0000
tree 0624619a3fbcb528b4c334c04407a7a49a1b1f24
parent dc26731665e6d5e08bde3ec8145eb98f61f4b950

Adjust k8s network definition related to Calico refactoring.

Change-Id: I51c456ae4070931ccb3f58539ef24f482000b39a

classes/cluster/sl-k8s-calico/kubernetes/compute.yml

diff --git a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
index 7faf456..bc4272d 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
@@ -7,7 +7,7 @@
 - cluster.sl-k8s-calico
 parameters:
   _param:
-    kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+    kubernetes_calico_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
     kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
     kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
     kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
@@ -19,14 +19,13 @@
   kubernetes:
     pool:
       network:
-        etcd:
-          ssl:
-            enabled: true
-        image: ${_param:kubernetes_calico_image}
-        calicoctl:
-          image: ${_param:kubernetes_calicoctl_image}
-        cni:
-          image: ${_param:kubernetes_calico_cni_image}
+        calico:
+          image: ${_param:kubernetes_calico_image}
+          calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
+          cni_image: ${_param:kubernetes_calico_cni_image}
+          etcd:
+            ssl:
+              enabled: true
     common:
       hyperkube:
         image: ${_param:kubernetes_hyperkube_image}