From 44c2987231504405df1439b5026b11afe48b683d Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Fri, 7 Apr 2017 10:35:33 -0400
Subject: Removing docker-registry route from cockpit-ui.
---
roles/cockpit-ui/tasks/main.yml | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
(limited to 'roles')
diff --git a/roles/cockpit-ui/tasks/main.yml b/roles/cockpit-ui/tasks/main.yml
index 8bd68787a..1d42110b8 100644
--- a/roles/cockpit-ui/tasks/main.yml
+++ b/roles/cockpit-ui/tasks/main.yml
@@ -1,14 +1,10 @@
---
- block:
- - name: Create passthrough route for docker-registry
- oc_route:
- kubeconfig: "{{ openshift_master_config_dir }}/admin.kubeconfig"
- name: docker-registry
- namespace: default
- service_name: docker-registry
- state: present
- tls_termination: passthrough
- register: docker_registry_route
+
+ # 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: Create passthrough route for registry-console
oc_route:
--
cgit v1.2.3
From fddcb7414bb2ea67988626ebb7d60e3627ac9891 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Fri, 7 Apr 2017 15:48:50 -0400
Subject: Adding a query for the existing docker-registry route.
---
roles/cockpit-ui/tasks/main.yml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
(limited to 'roles')
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
--
cgit v1.2.3