summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-02-09 13:20:06 -0500
committerScott Dodson <sdodson@redhat.com>2017-02-09 13:22:25 -0500
commit00f438ac92323cf3f2109adb7f2f70998f77bc23 (patch)
tree1c016c5b454f6142f86bc887afb718786400d44c /roles
parent8b6f88ea657662fb6724c2d4863b6c954f9580d8 (diff)
downloadopenshift-00f438ac92323cf3f2109adb7f2f70998f77bc23.tar.gz
openshift-00f438ac92323cf3f2109adb7f2f70998f77bc23.tar.bz2
openshift-00f438ac92323cf3f2109adb7f2f70998f77bc23.tar.xz
openshift-00f438ac92323cf3f2109adb7f2f70998f77bc23.zip
Document openshift_cockpit_deployer_prefix and add
openshift_cockpit_deployer_version Fixes Bug 1393666
Diffstat (limited to 'roles')
-rw-r--r--roles/cockpit-ui/tasks/main.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/cockpit-ui/tasks/main.yml b/roles/cockpit-ui/tasks/main.yml
index 87ed7fee7..f2ef4f161 100644
--- a/roles/cockpit-ui/tasks/main.yml
+++ b/roles/cockpit-ui/tasks/main.yml
@@ -63,10 +63,12 @@
changed_when: false
when: check_docker_registry_exists.rc == 0
+# 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
{% if openshift_cockpit_deployer_prefix is defined %}-p IMAGE_PREFIX="{{ openshift_cockpit_deployer_prefix }}"{% endif %}
+ {% if openshift_cockpit_deployer_version is defined %}-p IMAGE_VERSION="{{ openshift_cockpit_deployer_version }}"{% endif %}
-p OPENSHIFT_OAUTH_PROVIDER_URL="{{ openshift.master.public_api_url }}"
-p REGISTRY_HOST="{{ docker_registry_route.stdout }}"
-p COCKPIT_KUBE_URL="{{ registry_console_cockpit_kube_url.stdout }}"