summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-09-07 00:12:29 -0400
committerGitHub <noreply@github.com>2017-09-07 00:12:29 -0400
commitce52a1f49221aecc8e0dd5170d71976d7a2db5de (patch)
tree8686789d56914241462b8ed22e8c7bc5e002ba30
parentb2dfd210e56e827108dd3d80a24b2c8631496539 (diff)
parentacbdf93530ed368c0f879b3eaaa8079754fb7272 (diff)
downloadopenshift-ce52a1f49221aecc8e0dd5170d71976d7a2db5de.tar.gz
openshift-ce52a1f49221aecc8e0dd5170d71976d7a2db5de.tar.bz2
openshift-ce52a1f49221aecc8e0dd5170d71976d7a2db5de.tar.xz
openshift-ce52a1f49221aecc8e0dd5170d71976d7a2db5de.zip
Merge pull request #5162 from aerialls/patch-2
Merged by openshift-bot
-rw-r--r--roles/openshift_hosted/tasks/router/router.yml18
1 files changed, 9 insertions, 9 deletions
diff --git a/roles/openshift_hosted/tasks/router/router.yml b/roles/openshift_hosted/tasks/router/router.yml
index e57ed733e..68ec7233e 100644
--- a/roles/openshift_hosted/tasks/router/router.yml
+++ b/roles/openshift_hosted/tasks/router/router.yml
@@ -18,6 +18,15 @@
openshift_hosted_router_selector: "{{ openshift.hosted.router.selector | default(None) }}"
openshift_hosted_router_image: "{{ openshift.hosted.router.registryurl }}"
+- name: Get the certificate contents for router
+ copy:
+ backup: True
+ dest: "/etc/origin/master/{{ item | basename }}"
+ src: "{{ item }}"
+ with_items: "{{ openshift_hosted_routers | oo_collect(attribute='certificate') |
+ oo_select_keys_from_list(['keyfile', 'certfile', 'cafile']) }}"
+ when: ( not openshift_hosted_router_create_certificate | bool ) or openshift_hosted_router_certificate != {}
+
# This is for when we desire a cluster signed cert
# The certificate is generated and placed in master_config_dir/
- block:
@@ -43,15 +52,6 @@
# End Block
when: ( openshift_hosted_router_create_certificate | bool ) and openshift_hosted_router_certificate == {}
-- name: Get the certificate contents for router
- copy:
- backup: True
- dest: "/etc/origin/master/{{ item | basename }}"
- src: "{{ item }}"
- with_items: "{{ openshift_hosted_routers | oo_collect(attribute='certificate') |
- oo_select_keys_from_list(['keyfile', 'certfile', 'cafile']) }}"
- when: not openshift_hosted_router_create_certificate | bool
-
- name: Create the router service account(s)
oc_serviceaccount:
name: "{{ item.serviceaccount }}"