summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2018-01-18 16:44:59 -0500
committerGitHub <noreply@github.com>2018-01-18 16:44:59 -0500
commite1e5cdcdfd094079a2362d679bc08758a89a03d3 (patch)
tree9606f88abffccc21c01ceaf7299c9a49cd5d37e1
parent1a2a895356df638756d2117e3d324710167737db (diff)
parent420db1c040f1bdee1db38be51b7499a33288ebbd (diff)
downloadopenshift-e1e5cdcdfd094079a2362d679bc08758a89a03d3.tar.gz
openshift-e1e5cdcdfd094079a2362d679bc08758a89a03d3.tar.bz2
openshift-e1e5cdcdfd094079a2362d679bc08758a89a03d3.tar.xz
openshift-e1e5cdcdfd094079a2362d679bc08758a89a03d3.zip
Merge pull request #6774 from sdodson/webconsole-image-prefix
Make openshift_web_console_prefix defaults like other components
-rw-r--r--roles/openshift_web_console/vars/default_images.yml4
-rw-r--r--roles/openshift_web_console/vars/openshift-enterprise.yml4
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_web_console/vars/default_images.yml b/roles/openshift_web_console/vars/default_images.yml
index 7adb8a0d0..42d331ac5 100644
--- a/roles/openshift_web_console/vars/default_images.yml
+++ b/roles/openshift_web_console/vars/default_images.yml
@@ -1,4 +1,4 @@
---
-__openshift_web_console_prefix: "docker.io/openshift/"
+__openshift_web_console_prefix: "docker.io/openshift/origin-"
__openshift_web_console_version: "latest"
-__openshift_web_console_image_name: "origin-web-console"
+__openshift_web_console_image_name: "web-console"
diff --git a/roles/openshift_web_console/vars/openshift-enterprise.yml b/roles/openshift_web_console/vars/openshift-enterprise.yml
index 721ac1d27..375c22067 100644
--- a/roles/openshift_web_console/vars/openshift-enterprise.yml
+++ b/roles/openshift_web_console/vars/openshift-enterprise.yml
@@ -1,4 +1,4 @@
---
-__openshift_web_console_prefix: "registry.access.redhat.com/openshift3/"
+__openshift_web_console_prefix: "registry.access.redhat.com/openshift3/ose-"
__openshift_web_console_version: "v3.9"
-__openshift_web_console_image_name: "ose-web-console"
+__openshift_web_console_image_name: "web-console"