Add version tag for contrail containers
Add option to select version of the contrail
containers to be deployed. By default version is
taken from apt_mk_version.
Name of the parameter for the version was changed
to contrail_container_version to be more clear
what it means.
Closes-bug: #PROD-24515
Change-Id: I937638cd614532418807607b3b75f0e1d13661a4
diff --git a/tests/pillar/master_contrail.sls b/tests/pillar/master_contrail.sls
index d506d2f..ced09cb 100644
--- a/tests/pillar/master_contrail.sls
+++ b/tests/pillar/master_contrail.sls
@@ -38,6 +38,15 @@
enabled: true
namespace: kube-system
image: yashulyak/contrail-controller:latest
+ opencontrail:
+ controller:
+ image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-controller:latest
+ analyticsdb:
+ image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-analyticsdb:latest
+ analytics:
+ image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-analytics:latest
+ kube_manager:
+ image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-kube-manager:latest
monitoring:
backend: prometheus
master:
diff --git a/tests/pillar/master_contrail4_0.sls b/tests/pillar/master_contrail4_0.sls
index 60b6cb0..3c5997d 100644
--- a/tests/pillar/master_contrail4_0.sls
+++ b/tests/pillar/master_contrail4_0.sls
@@ -34,6 +34,15 @@
enabled: true
namespace: kube-system
image: mirantis/virtlet:v1.0.3
+ opencontrail:
+ controller:
+ image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-controller:latest
+ analyticsdb:
+ image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-analyticsdb:latest
+ analytics:
+ image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-analytics:latest
+ kube_manager:
+ image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-kube-manager:latest
monitoring:
backend: prometheus
master: