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

diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml b/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml
index 5fafd8e..d13f132 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml
@@ -33,8 +33,6 @@
     pool:
       network:
         engine: opencontrail
-        opencontrail:
-          address: ${_param:opencontrail_control_address}
     common:
       hyperkube:
         image: ${_param:kubernetes_hyperkube_image}

classes/cluster/sl-k8s-contrail/kubernetes/control.yml

diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/control.yml b/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
index ba70eae..f1ee23b 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
@@ -40,8 +40,7 @@
           enabled: true
       network:
         engine: opencontrail
-        public_ip_range: 185.22.97.128/26
-        public_network: default-domain:default-project:Public
-        private_ip_range: 10.150.0.0/16
-        opencontrail:
-          address: ${_param:opencontrail_control_address}
+        contrail:
+          public_ip_range: 185.22.97.128/26
+          public_network: default-domain:default-project:Public
+          private_ip_range: 10.150.0.0/16