commit 11a0cd2ff3d14d900060c8d22a1bd88cbe76b24b
author Andrey Shestakov <ashestakov@mirantis.com> Mon Mar 19 17:24:41 2018 +0200
committer Andrey Shestakov <ashestakov@mirantis.com> Mon Mar 19 17:24:41 2018 +0200
tree e265f661f4e7405af0c8059f2e4b10248a9d04f0
parent 4cf6dfc9492151b58996757348b8157b8ee9855a

Change k8s network definitions structure.

Change-Id: Ibb460339e4f059efc1da7df587cad5f79a206068

classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml

diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
index b90bbe1..2ada67e 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
@@ -14,9 +14,8 @@
   kubernetes:
     pool:
       network:
-        cnis:
-        - calico
         calico:
+          enabled: true
           image: ${_param:kubernetes_calico_image}
           calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
           cni_image: ${_param:kubernetes_calico_cni_image}

classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml

diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
index 813c28a..e2b9819 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
@@ -44,9 +44,8 @@
         ssl:
           enabled: true
       network:
-        cnis:
-        - calico
         calico:
+          enabled: true
           etcd:
             ssl:
               enabled: true