summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Brochet <mewt.fr@gmail.com>2017-08-22 17:23:07 +0200
committerGitHub <noreply@github.com>2017-08-22 17:23:07 +0200
commit470524c9154a3a69a7fe3fb385578bf80ee93558 (patch)
treef0311081179ca4a8646e74ef8954c8c38d3df4f0
parentb107f677a3563f6db9a1ef17fe10518d321d495c (diff)
downloadopenshift-470524c9154a3a69a7fe3fb385578bf80ee93558.tar.gz
openshift-470524c9154a3a69a7fe3fb385578bf80ee93558.tar.bz2
openshift-470524c9154a3a69a7fe3fb385578bf80ee93558.tar.xz
openshift-470524c9154a3a69a7fe3fb385578bf80ee93558.zip
ensured to always use a certificate for the router
-rw-r--r--roles/openshift_hosted/tasks/router/router.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_hosted/tasks/router/router.yml b/roles/openshift_hosted/tasks/router/router.yml
index 72a1ead80..eb91bac12 100644
--- a/roles/openshift_hosted/tasks/router/router.yml
+++ b/roles/openshift_hosted/tasks/router/router.yml
@@ -50,7 +50,7 @@
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
+ when: ( not openshift_hosted_router_create_certificate | bool ) or openshift_hosted_router_certificate != {}
- name: Create the router service account(s)
oc_serviceaccount: