diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-07-17 16:08:01 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-07-18 15:47:49 -0400 |
| commit | b83771910cde314d846ea9df3ac30ed826d5446f (patch) | |
| tree | 7b51a48e09b0b1e5ad8167afbef476a693623b9b /roles | |
| parent | 166db870ed38eaff45a040128c9f4aca252f25d0 (diff) | |
| download | openshift-b83771910cde314d846ea9df3ac30ed826d5446f.tar.gz openshift-b83771910cde314d846ea9df3ac30ed826d5446f.tar.bz2 openshift-b83771910cde314d846ea9df3ac30ed826d5446f.tar.xz openshift-b83771910cde314d846ea9df3ac30ed826d5446f.zip | |
Resolve some deprecation warnings.
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_hosted/tasks/router/router.yml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/roles/openshift_hosted/tasks/router/router.yml b/roles/openshift_hosted/tasks/router/router.yml index c011db762..95f0617dc 100644 --- a/roles/openshift_hosted/tasks/router/router.yml +++ b/roles/openshift_hosted/tasks/router/router.yml @@ -9,10 +9,15 @@ module: slurp src: "{{ item }}" register: openshift_router_certificate_output + # Defaulting dictionary keys to none to avoid deprecation warnings + # (future fatal errors) during template evaluation. Dictionary keys + # won't be accessed unless openshift_hosted_router_certificate is + # defined and has all keys (certfile, keyfile, cafile) which we + # check above. with_items: - - "{{ openshift_hosted_router_certificate.certfile }}" - - "{{ openshift_hosted_router_certificate.keyfile }}" - - "{{ openshift_hosted_router_certificate.cafile }}" + - "{{ (openshift_hosted_router_certificate | default({'certfile':none})).certfile }}" + - "{{ (openshift_hosted_router_certificate | default({'keyfile':none})).keyfile }}" + - "{{ (openshift_hosted_router_certificate | default({'cafile':none})).cafile }}" when: openshift_hosted_router_certificate is defined - name: Persist certificate contents |