commit f469962a5f2480a1de06fce1df57543394ec413f
author vrovachev <vrovachev@mirantis.com> Wed Aug 09 21:04:02 2017 +0400
committer Tomas Kukral <tkukral@mirantis.com> Mon Aug 14 12:47:01 2017 +0000
tree 8c3cd37fa25d45f08f2aae3192b5b0466e1c78cc
parent 130b8c7807179e6be20b1b45fee9c73efd7b3978

Add contrail_cni parameter for k8s_ha_contrail cluster.

* Fixed problem with kubernetes:pool command for k8s_ha_contrail
cluster.

Change-Id: Ibd6d4eb5451f69f62f9a708c2286e8c3a143720c

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 4282d49..499f290 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -45,7 +45,7 @@
         cni:
           image: ${_param:kubernetes_calico_cni_image}
         contrail_cni:
-          image: ${_param:kubernetes_contrail_cni_image}
+          image: ${_param:kubernetes_opencontrail_cni_image}
     common:
       hyperkube:
         image: ${_param:kubernetes_hyperkube_image}