diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-19 20:17:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-19 20:17:58 -0400 |
| commit | 39bc207ab2f60570c6de35fbd86ae7d47ade4bd7 (patch) | |
| tree | 7af7a119a40dfd97116f1627361bf1bcecc6d614 | |
| parent | f76e35767f060f30de99efcfa8d0e058fad8b88e (diff) | |
| parent | 6b0e66f285ffa9ed633db4a4eed1974d90128b64 (diff) | |
| download | openshift-39bc207ab2f60570c6de35fbd86ae7d47ade4bd7.tar.gz openshift-39bc207ab2f60570c6de35fbd86ae7d47ade4bd7.tar.bz2 openshift-39bc207ab2f60570c6de35fbd86ae7d47ade4bd7.tar.xz openshift-39bc207ab2f60570c6de35fbd86ae7d47ade4bd7.zip | |
Merge pull request #2179 from abutcher/router-cert-contents
Check router certificate contents when securing router
| -rw-r--r-- | roles/openshift_hosted/tasks/router/router.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_hosted/tasks/router/router.yml b/roles/openshift_hosted/tasks/router/router.yml index 95f0617dc..dfea8ca4b 100644 --- a/roles/openshift_hosted/tasks/router/router.yml +++ b/roles/openshift_hosted/tasks/router/router.yml @@ -32,7 +32,7 @@ content: "{{ openshift.hosted.router.certificate.contents }}" dest: "{{ openshift_master_config_dir }}/openshift-router.pem" mode: 0600 - when: openshift.hosted.router.certificate | default(none) is not none + when: "'certificate' in openshift.hosted.router and 'contents' in openshift.hosted.router.certificate" - name: Retrieve list of openshift nodes matching router selector command: > @@ -53,7 +53,7 @@ {% if replicas > 1 -%} --replicas={{ replicas }} {% endif -%} - {% if openshift.hosted.router.certificate | default(none) is not none -%} + {% if 'certificate' in openshift.hosted.router and 'contents' in openshift.hosted.router.certificate -%} --default-cert={{ openshift_master_config_dir }}/openshift-router.pem {% endif -%} --namespace={{ openshift.hosted.router.namespace | default('default') }} |