summaryrefslogtreecommitdiffstats
path: root/roles/cockpit-ui/tasks
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-04-07 15:48:50 -0400
committerKenny Woodson <kwoodson@redhat.com>2017-04-07 15:48:50 -0400
commitfddcb7414bb2ea67988626ebb7d60e3627ac9891 (patch)
tree64480cde6cafd386be93de3be0265ea7bae0034c /roles/cockpit-ui/tasks
parent44c2987231504405df1439b5026b11afe48b683d (diff)
downloadopenshift-fddcb7414bb2ea67988626ebb7d60e3627ac9891.tar.gz
openshift-fddcb7414bb2ea67988626ebb7d60e3627ac9891.tar.bz2
openshift-fddcb7414bb2ea67988626ebb7d60e3627ac9891.tar.xz
openshift-fddcb7414bb2ea67988626ebb7d60e3627ac9891.zip
Adding a query for the existing docker-registry route.
Diffstat (limited to 'roles/cockpit-ui/tasks')
-rw-r--r--roles/cockpit-ui/tasks/main.yml9
1 files changed, 8 insertions, 1 deletions
diff --git a/roles/cockpit-ui/tasks/main.yml b/roles/cockpit-ui/tasks/main.yml
index 1d42110b8..0114498f8 100644
--- a/roles/cockpit-ui/tasks/main.yml
+++ b/roles/cockpit-ui/tasks/main.yml
@@ -5,6 +5,13 @@
# 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
+ state: list
+ register: docker_registry_route
- name: Create passthrough route for registry-console
oc_route:
@@ -37,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