summaryrefslogtreecommitdiffstats
path: root/roles/cockpit-ui
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-09-21 10:32:22 -0400
committerSamuel Munilla <smunilla@redhat.com>2016-09-29 15:16:39 -0400
commitf255943326ad3be91d233609ec5e61382302fff5 (patch)
tree9e2a96b8ec3ef25d109d663d6b1fcb79b8500937 /roles/cockpit-ui
parenta3ab3d539bb57bc224b3f4457a0bfc68484cf8ee (diff)
downloadopenshift-f255943326ad3be91d233609ec5e61382302fff5.tar.gz
openshift-f255943326ad3be91d233609ec5e61382302fff5.tar.bz2
openshift-f255943326ad3be91d233609ec5e61382302fff5.tar.xz
openshift-f255943326ad3be91d233609ec5e61382302fff5.zip
Secure registry improvements.
* Convert oc template calls to jsonpath. * Wait for deployments to finish before restarting docker. * Re-organize node ca configuration.
Diffstat (limited to 'roles/cockpit-ui')
-rw-r--r--roles/cockpit-ui/tasks/main.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/cockpit-ui/tasks/main.yml b/roles/cockpit-ui/tasks/main.yml
index 953357392..c573da6d6 100644
--- a/roles/cockpit-ui/tasks/main.yml
+++ b/roles/cockpit-ui/tasks/main.yml
@@ -36,7 +36,7 @@
- name: Retrieve docker-registry route
command: >
{{ openshift.common.client_binary }} get route docker-registry
- --template='{{ '{{' }} .spec.host {{ '}}' }}'
+ -o jsonpath='{.spec.host}'
--config={{ openshift_hosted_kubeconfig }}
-n default
register: docker_registry_route
@@ -45,7 +45,7 @@
- name: Retrieve cockpit kube url
command: >
{{ openshift.common.client_binary }} get route registry-console
- --template='https://{{ '{{' }} .spec.host {{ '}}' }}'
+ -o jsonpath='https://{.spec.host}'
-n default
register: registry_console_cockpit_kube_url
changed_when: false