commit 0be51066b243400220654c1326e910f75aa7aa9a
author Jan Cach <cach.jan@gmail.com> Mon Nov 05 12:57:36 2018 +0100
committer Victor Ryzhenkin <vryzhenkin@mirantis.com> Wed Nov 07 20:02:29 2018 +0400
tree 2ff0df4b037fbe218fcfdf09b69507c59189f2ee
parent ef3e1f3b96e9b81aeb0ca27cae74bc15dc40763e

Define apt_mk_version as contrail container tag version for k8s

Closes-bug: #PROD-24515

Change-Id: Icd6fa11ec7618eef9e6c08be8129cdf8d738e336

defaults/linux_system_repo.yml

diff --git a/defaults/linux_system_repo.yml b/defaults/linux_system_repo.yml
index 81497c6..1194dce 100644
--- a/defaults/linux_system_repo.yml
+++ b/defaults/linux_system_repo.yml
@@ -38,3 +38,4 @@
     linux_system_repo_mcp_glusterfs_version_number: "3.8"
     linux_system_repo_mcp_saltstack_version_number: "${_param:salt_version}"
     linux_system_repo_mcp_ceph_codename: luminous
+    linux_repo_contrail_component: oc40

kubernetes/common/init.yml

diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index 8028f51..d2f597a 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -7,6 +7,7 @@
     kubernetes_hyperkube_repo: ${_param:mcp_docker_registry}/mirantis/kubernetes
     kubernetes_contrail_cni_repo: ${_param:mcp_docker_registry}/mirantis/kubernetes
     kubernetes_contrail_network_controller_repo: ${_param:mcp_docker_registry}/mirantis/kubernetes/contrail-integration
+    kubernetes_contrail_registry: ${_param:mcp_docker_registry}/opencontrail-${_param:linux_repo_contrail_component}
     kubernetes_netchecker_agent_repo: mirantis
     kubernetes_netchecker_server_repo: mirantis
     kubernetes_virtlet_repo: mirantis
@@ -59,6 +60,10 @@
     kubernetes_corends_etcd_operator_image: ${_param:kubernetes_corends_etcd_operator_repo}/etcd-operator:v0.9.2
     kubernetes_containerd_source: ${_param:kubernetes_containerd_repo}/v1.12.0/crictl-v1.12.0-linux-amd64.tar.gz
     kubernetes_containerd_source_hash: md5=ff60b9ddfa5617f7ed14b3f3b6a60056
+    kubernetes_opencontrail_controller_image: ${_param:kubernetes_contrail_registry}/opencontrail-controller:${_param:apt_mk_version}
+    kubernetes_opencontrail_analyticsdb_image: ${_param:kubernetes_contrail_registry}/opencontrail-analyticsdb:${_param:apt_mk_version}
+    kubernetes_opencontrail_analytics_image: ${_param:kubernetes_contrail_registry}/opencontrail-analytics:${_param:apt_mk_version}
+    kubernetes_opencontrail_kube_manager_image: ${_param:kubernetes_contrail_registry}/opencontrail-kube-manager:${_param:apt_mk_version}
 
     kubelet_fail_on_swap: true
     kubernetes_dashboard_enabled: true
@@ -145,6 +150,15 @@
         contrail_network_controller:
           enabled: ${_param:kubernetes_contrail_network_controller_enabled}
           image: ${_param:kubernetes_contrail_network_controller_image}
+        opencontrail:
+          controller:
+            image: ${_param:kubernetes_opencontrail_controller_image}
+          analyticsdb:
+            image: ${_param:kubernetes_opencontrail_analyticsdb_image}
+          analytics:
+            image: ${_param:kubernetes_opencontrail_analytics_image}
+          kube_manager:
+            image: ${_param:kubernetes_opencontrail_kube_manager_image}
         flannel:
           image: ${_param:kubernetes_flannel_image}
         telegraf: