summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-04-10 10:55:43 -0500
committerGitHub <noreply@github.com>2017-04-10 10:55:43 -0500
commitde6629addd794c6daaf018943097cc0d6aba5b23 (patch)
treea19843a1d649ca862cd2cc3d35584c60a1c0f940 /roles
parent3ea629b458c78db194443563aab4a8d09e9a07b4 (diff)
parentfddcb7414bb2ea67988626ebb7d60e3627ac9891 (diff)
downloadopenshift-de6629addd794c6daaf018943097cc0d6aba5b23.tar.gz
openshift-de6629addd794c6daaf018943097cc0d6aba5b23.tar.bz2
openshift-de6629addd794c6daaf018943097cc0d6aba5b23.tar.xz
openshift-de6629addd794c6daaf018943097cc0d6aba5b23.zip
Merge pull request #3880 from kwoodson/cockpit_ui_remove_route
Merged by openshift-bot
Diffstat (limited to 'roles')
-rw-r--r--roles/cockpit-ui/tasks/main.yml13
1 files changed, 8 insertions, 5 deletions
diff --git a/roles/cockpit-ui/tasks/main.yml b/roles/cockpit-ui/tasks/main.yml
index 8bd68787a..0114498f8 100644
--- a/roles/cockpit-ui/tasks/main.yml
+++ b/roles/cockpit-ui/tasks/main.yml
@@ -1,13 +1,16 @@
---
- block:
- - name: Create passthrough route for docker-registry
+
+ # When openshift_hosted_manage_registry=true the openshift_hosted
+ # role will create the appropriate route for the docker-registry.
+ # When openshift_hosted_manage_registry=false then this code will
+ # not be run.
+ - name: fetch the docker-registry route
oc_route:
kubeconfig: "{{ openshift_master_config_dir }}/admin.kubeconfig"
name: docker-registry
namespace: default
- service_name: docker-registry
- state: present
- tls_termination: passthrough
+ state: list
register: docker_registry_route
- name: Create passthrough route for registry-console
@@ -41,7 +44,7 @@
{% 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.results.results[0].spec.host }}"
+ -p REGISTRY_HOST="{{ docker_registry_route.results[0].spec.host }}"
-p COCKPIT_KUBE_URL="https://{{ registry_console_cockpit_kube.results.results[0].spec.host }}"
--config={{ openshift_hosted_kubeconfig }}
-n default