summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorErez Freiberger <efreiber@redhat.com>2017-07-06 16:26:10 +0300
committerErez Freiberger <efreiber@redhat.com>2017-07-25 19:55:40 +0300
commit3dcbba70c0e282c33c5dd197b7e0935b3be66b60 (patch)
treefdd1a21b2d2b7b5dcf176672d7e046f9abbfc272 /roles
parentcd578ccdb6cced49fde252077e135288d20f8e2a (diff)
downloadopenshift-3dcbba70c0e282c33c5dd197b7e0935b3be66b60.tar.gz
openshift-3dcbba70c0e282c33c5dd197b7e0935b3be66b60.tar.bz2
openshift-3dcbba70c0e282c33c5dd197b7e0935b3be66b60.tar.xz
openshift-3dcbba70c0e282c33c5dd197b7e0935b3be66b60.zip
Router wildcard certificate created by default
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_hosted/defaults/main.yml2
-rw-r--r--roles/openshift_hosted/tasks/router/router.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_hosted/defaults/main.yml b/roles/openshift_hosted/defaults/main.yml
index 089054e2f..0391e5602 100644
--- a/roles/openshift_hosted/defaults/main.yml
+++ b/roles/openshift_hosted/defaults/main.yml
@@ -29,7 +29,7 @@ openshift_hosted_routers:
openshift_hosted_router_certificate: {}
openshift_hosted_registry_cert_expire_days: 730
-openshift_hosted_router_create_certificate: False
+openshift_hosted_router_create_certificate: True
os_firewall_allow:
- service: Docker Registry Port
diff --git a/roles/openshift_hosted/tasks/router/router.yml b/roles/openshift_hosted/tasks/router/router.yml
index c60b67862..b6ead5123 100644
--- a/roles/openshift_hosted/tasks/router/router.yml
+++ b/roles/openshift_hosted/tasks/router/router.yml
@@ -37,7 +37,7 @@
cafile: "{{ openshift_master_config_dir ~ '/ca.crt' }}"
# End Block
- when: openshift_hosted_router_create_certificate | bool
+ when: ( openshift_hosted_router_create_certificate | bool ) and openshift_hosted_router_certificate == {}
- name: Get the certificate contents for router
copy: