summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-18 01:34:20 -0800
committerGitHub <noreply@github.com>2018-01-18 01:34:20 -0800
commit6a26d0c0799cf5915c61205450e18ff010485beb (patch)
treec3133f0d72f708848359676d073967c180072e21 /roles
parent6a69cb8e4f7835b54ee339a5ff4e8b5a899997fd (diff)
parent1ff291fb0e9fd137cfe42a033dad9daac921e50e (diff)
downloadopenshift-6a26d0c0799cf5915c61205450e18ff010485beb.tar.gz
openshift-6a26d0c0799cf5915c61205450e18ff010485beb.tar.bz2
openshift-6a26d0c0799cf5915c61205450e18ff010485beb.tar.xz
openshift-6a26d0c0799cf5915c61205450e18ff010485beb.zip
Merge pull request #6752 from vrutkovs/tsb-prefix
Automatic merge from submit-queue. Rework default TSB prefix and imagename to match other services Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1518917
Diffstat (limited to 'roles')
-rw-r--r--roles/template_service_broker/vars/default_images.yml4
-rw-r--r--roles/template_service_broker/vars/openshift-enterprise.yml4
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/template_service_broker/vars/default_images.yml b/roles/template_service_broker/vars/default_images.yml
index 662d65d9f..dc164a4db 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/"
+__template_service_broker_prefix: "docker.io/openshift/origin-"
__template_service_broker_version: "latest"
-__template_service_broker_image_name: "origin-template-service-broker"
+__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 16a08e72f..b65b97691 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/"
+__template_service_broker_prefix: "registry.access.redhat.com/openshift3/ose-"
__template_service_broker_version: "v3.7"
-__template_service_broker_image_name: "ose-template-service-broker"
+__template_service_broker_image_name: "template-service-broker"