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-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 60c2328..f8f568b 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -36,9 +36,8 @@
       kubelet:
         fail_on_swap: ${_param:kubelet_fail_on_swap}
       network:
-        cnis:
-        - opencontrail
-        contrail:
+        opencontrail:
+          enabled: true
           config:
             api:
               host: ${_param:opencontrail_control_address}

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 0968833..d2210eb 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -50,9 +50,8 @@
         netchecker:
           enabled: ${_param:kubernetes_netchecker_enabled}
       network:
-        cnis:
-        - opencontrail
-        contrail:
+        opencontrail:
+          enabled: true
           public_ip_range: 185.22.97.128/26
           public_network: default-domain:default-project:Public
           private_ip_range: 10.150.0.0/16