summaryrefslogtreecommitdiffstats
path: root/roles/cockpit-ui/tasks
diff options
context:
space:
mode:
authorLuke Meyer <lmeyer@redhat.com>2017-10-20 13:12:26 -0400
committerLuke Meyer <lmeyer@redhat.com>2017-11-06 14:37:03 -0500
commit37812f0da8f72df9108bfdcd882439d3faeea79b (patch)
tree55e26a77dc044bdb464a0bcb2660066641212630 /roles/cockpit-ui/tasks
parent5efcf4a2f7e9c2f21c6f9f86dc08f12fd5f56290 (diff)
downloadopenshift-37812f0da8f72df9108bfdcd882439d3faeea79b.tar.gz
openshift-37812f0da8f72df9108bfdcd882439d3faeea79b.tar.bz2
openshift-37812f0da8f72df9108bfdcd882439d3faeea79b.tar.xz
openshift-37812f0da8f72df9108bfdcd882439d3faeea79b.zip
reconcile registry-console and docker_image_availability
Fixes bug 1497310 https://bugzilla.redhat.com/show_bug.cgi?id=1497310 The registry console is a special case in more than one way. This adds logic to incorporate the openshift_cockpit_deployer_* variables into determining what its image will be in docker_image_availability. Along the way I noticed the origin and enterprise templates for this were not consistent. Now they are, and the example hosts file is updated.
Diffstat (limited to 'roles/cockpit-ui/tasks')
-rw-r--r--roles/cockpit-ui/tasks/main.yml1
1 files changed, 0 insertions, 1 deletions
diff --git a/roles/cockpit-ui/tasks/main.yml b/roles/cockpit-ui/tasks/main.yml
index 244e2cc41..09f4259a2 100644
--- a/roles/cockpit-ui/tasks/main.yml
+++ b/roles/cockpit-ui/tasks/main.yml
@@ -37,7 +37,6 @@
cp {{ openshift_master_config_dir }}/admin.kubeconfig {{ openshift_hosted_kubeconfig }}
changed_when: False
- # TODO: Need to fix the origin and enterprise templates so that they both respect IMAGE_PREFIX
- name: Deploy registry-console
command: >
{{ openshift.common.client_binary }} new-app --template=registry-console