summaryrefslogtreecommitdiffstats
path: root/roles/template_service_broker
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-02-09 02:45:52 -0800
committerGitHub <noreply@github.com>2018-02-09 02:45:52 -0800
commit3ef7a209dde51c972d25c8ecfc019704ce056db7 (patch)
treeedb25069c7da9c8fc5f42e1321dbe3823ebc39bc /roles/template_service_broker
parent15827bd85421fc8fe09487d06efc013292664147 (diff)
parente6e8c13d7d65c81c287a5b53403866db8280a5bf (diff)
downloadopenshift-3ef7a209dde51c972d25c8ecfc019704ce056db7.tar.gz
openshift-3ef7a209dde51c972d25c8ecfc019704ce056db7.tar.bz2
openshift-3ef7a209dde51c972d25c8ecfc019704ce056db7.tar.xz
openshift-3ef7a209dde51c972d25c8ecfc019704ce056db7.zip
Merge pull request #6712 from vrutkovs/avoid-hardcoding-image-version
Automatic merge from submit-queue. Set default image to openshift_release Previously `v3.7` was hardcoded as a default value, instead `openshift_release` should be used. A new var is introduced - `openshift_template_service_broker_image_tag`, similar to vars for other services. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1530183 TODO: * [x] Make sure all images have a variable for image prefix * [x] Figure out if `latest` is a good default for origin images * [ ] Set correct `openshift_image_tag` in CI inventory for tests to pass
Diffstat (limited to 'roles/template_service_broker')
-rw-r--r--roles/template_service_broker/vars/default_images.yml2
-rw-r--r--roles/template_service_broker/vars/openshift-enterprise.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/template_service_broker/vars/default_images.yml b/roles/template_service_broker/vars/default_images.yml
index dc164a4db..b99f52bbb 100644
--- a/roles/template_service_broker/vars/default_images.yml
+++ b/roles/template_service_broker/vars/default_images.yml
@@ -1,4 +1,4 @@
---
__template_service_broker_prefix: "docker.io/openshift/origin-"
-__template_service_broker_version: "latest"
+__template_service_broker_version: "{{ openshift_image_tag }}"
__template_service_broker_image_name: "template-service-broker"
diff --git a/roles/template_service_broker/vars/openshift-enterprise.yml b/roles/template_service_broker/vars/openshift-enterprise.yml
index b65b97691..4bc3795bd 100644
--- a/roles/template_service_broker/vars/openshift-enterprise.yml
+++ b/roles/template_service_broker/vars/openshift-enterprise.yml
@@ -1,4 +1,4 @@
---
__template_service_broker_prefix: "registry.access.redhat.com/openshift3/ose-"
-__template_service_broker_version: "v3.7"
+__template_service_broker_version: "{{ openshift_image_tag }}"
__template_service_broker_image_name: "template-service-broker"