commit 82b05aa3574d800cea40e3c3484ebc7bf6118794
author Sergii Golovatiuk <sgolovatiuk@mirantis.com> Thu Jul 06 15:05:15 2017 +0200
committer Sergii Golovatiuk <sgolovatiuk@mirantis.com> Mon Jul 10 13:21:49 2017 +0200
tree 1c434eb3df8bb19033dff355016d303c5e7a3178
parent 1e8c4a4f36182ca5c9e2c2c5b282fe9f9c941e80

Add metadata for opencontrail cni image

Change-Id: I802515665c33abe01dc97aad4611ebb9e65a5f04
Signed-off-by: Sergii Golovatiuk <sgolovatiuk@mirantis.com>

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 d9f03d1..7102b27 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -44,6 +44,8 @@
           image: ${_param:kubernetes_calicoctl_image}
         cni:
           image: ${_param:kubernetes_calico_cni_image}
+        contrail_cni:
+          image: ${_param:kubernetes_contrail_cni_image}
     common:
       hyperkube:
         image: ${_param:kubernetes_hyperkube_image}

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 a5e197f..6018722 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -23,6 +23,8 @@
     kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
     kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
     kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
+    kubernetes_opencontrail_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-cni:v1.0.0
+
     kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
     kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
     kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0