| commit | 89c7acd035238677fa9e927de0ee2480eb6d4459 | [log] [tgz] |
|---|---|---|
| author | Sergii Golovatiuk <sgolovatiuk@mirantis.com> | Mon Jul 10 10:15:26 2017 +0200 |
| committer | Sergii Golovatiuk <sgolovatiuk@mirantis.com> | Mon Jul 10 13:05:29 2017 +0200 |
| tree | 111ae416e2600b3924039dc36939c71d4e8236fc | |
| parent | 1e8c4a4f36182ca5c9e2c2c5b282fe9f9c941e80 [diff] |
Correct cluster metadata for contrail-network-controller Change-Id: I650a7e26cc65e617283dbf80871345222b4b0b0f Signed-off-by: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml index 52e8c82..11e23c4 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
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml index a5e197f..ce0f8a5 100644 --- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml +++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -33,7 +33,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