commit adebbfcb3a82b92e3dd84ace0322e613cd2a0d39
author Andrey Shestakov <ashestakov@mirantis.com> Wed Mar 07 11:37:23 2018 +0200
committer Andrey Shestakov <ashestakov@mirantis.com> Wed Mar 07 09:38:45 2018 +0000
tree 6f7be505438396bf163feb4b6d36d750e523fa83
parent 35437e6cc77cc5716e4a16177b77b3e863760be3

Change k8s network.engine to network.cnis list.

Change-Id: I43d26f79bed68e32c189f04120769427b7eccc81

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

diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
index aa3d759..7ee7b30 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
@@ -14,6 +14,8 @@
   kubernetes:
     pool:
       network:
+        cnis:
+        - calico
         calico:
           image: ${_param:kubernetes_calico_image}
           calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}

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

diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
index ed10270..1640fb7 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
@@ -45,6 +45,8 @@
         ssl:
           enabled: true
       network:
+        cnis:
+        - calico
         calico:
           etcd:
             ssl: