commit ffb25f148036e33ad0bcd82c32879f7abee86bca
author Andrey Shestakov <ashestakov@mirantis.com> Tue Mar 06 18:31:25 2018 +0200
committer Andrey Shestakov <ashestakov@mirantis.com> Tue Mar 06 18:41:06 2018 +0000
tree e4eca556a94aa679068512c874d3fb7450243596
parent ccf05433fd3ad7fc68c5117bad3a16a83f548a08

Adjust k8s network definition related to Contrail refactoring.

Change-Id: I0643175cc3a73e4fd2b1454a6659df65bfcba84e

classes/cluster/k8s-ha-contrail/kubernetes/compute.yml

diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
index 57faff7..213ee65 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
@@ -39,11 +39,11 @@
         fail_on_swap: ${_param:kubelet_fail_on_swap}
       network:
         engine: opencontrail
-        config:
-          api:
-            host: ${_param:opencontrail_control_address}
-        contrail_cni:
-          image: ${_param:kubernetes_opencontrail_cni_image}
+        contrail:
+          config:
+            api:
+              host: ${_param:opencontrail_control_address}
+          cni_image: ${_param:kubernetes_opencontrail_cni_image}
     common:
       addons:
         virtlet: