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-contrail/kubernetes/compute.yml

diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
index f1b3f79..60c2328 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -36,7 +36,8 @@
       kubelet:
         fail_on_swap: ${_param:kubelet_fail_on_swap}
       network:
-        engine: opencontrail
+        cnis:
+        - opencontrail
         contrail:
           config:
             api:

classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml

diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
index e1198a6..0968833 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -50,7 +50,8 @@
         netchecker:
           enabled: ${_param:kubernetes_netchecker_enabled}
       network:
-        engine: opencontrail
+        cnis:
+        - opencontrail
         contrail:
           public_ip_range: 185.22.97.128/26
           public_network: default-domain:default-project:Public