From 37812f0da8f72df9108bfdcd882439d3faeea79b Mon Sep 17 00:00:00 2001 From: Luke Meyer Date: Fri, 20 Oct 2017 13:12:26 -0400 Subject: 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. --- roles/cockpit-ui/tasks/main.yml | 1 - 1 file changed, 1 deletion(-) (limited to 'roles/cockpit-ui') 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 -- cgit v1.2.1