commit 9ee59ec8dc9eb2ca73ce6137027c886ccbceddc8
author Jakub Pavlik <pavlk.jakub@gmail.com> Tue Jul 11 09:12:36 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Tue Jul 11 09:12:38 2017 +0000
tree 0162930ca10454146b9afe08255a024ec7af8858
parent 6d97ac10780cd7510b29d87eb36f557c33703b28
parent 89c7acd035238677fa9e927de0ee2480eb6d4459

Merge "Correct cluster metadata for contrail-network-controller"

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 c926910..00c9266 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -51,8 +51,10 @@
           - ${_param:kubernetes_compute_node01_hostname}
           - ${_param:kubernetes_compute_node02_hostname}
           image: ${_param:kubernetes_virtlet_image}
-        kube_network_manager:
-          enabled: ${_param:kubernetes_kube_network_manager_enabled}
+        contrail_network_controller:
+          namespace: kube-system
+          enabled: true
+          image: ${_param:kubernetes_contrail_network_controller_image}
       network:
         engine: opencontrail
         public_ip_range: 185.22.97.128/26

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

diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
index dbed35d..5a5a26d 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -35,7 +35,6 @@
     kubernetes_netchecker_enabled: true
     kubernetes_calico_policy_enabled: false
     kubernetes_virtlet_enabled: false
-    kubernetes_kube_network_manager_enabled: true
 
     # addresses and hostnames
     kubernetes_internal_api_address: 10.254.0.1