diff options
author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-01 21:50:15 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-01 21:50:15 -0500 |
commit | 81cf5123366814d098b7ca169a6e4deb2759507d (patch) | |
tree | 3645c65a323896f8a9536983332cb6854e656ebf /roles/openshift_certificate_expiry | |
parent | 4c2f899ac4f5ad183072e453ece4391ee456871f (diff) | |
parent | 717c36fde2639f6f3cc7bf534052e1df0479c2fe (diff) | |
download | openshift-81cf5123366814d098b7ca169a6e4deb2759507d.tar.gz openshift-81cf5123366814d098b7ca169a6e4deb2759507d.tar.bz2 openshift-81cf5123366814d098b7ca169a6e4deb2759507d.tar.xz openshift-81cf5123366814d098b7ca169a6e4deb2759507d.zip |
Merge pull request #3975 from sdodson/ansible_23_warnings
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_certificate_expiry')
-rw-r--r-- | roles/openshift_certificate_expiry/filter_plugins/oo_cert_expiry.py | 2 | ||||
-rw-r--r-- | roles/openshift_certificate_expiry/tasks/main.yml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_certificate_expiry/filter_plugins/oo_cert_expiry.py b/roles/openshift_certificate_expiry/filter_plugins/oo_cert_expiry.py index 5f102e960..577a14b9a 100644 --- a/roles/openshift_certificate_expiry/filter_plugins/oo_cert_expiry.py +++ b/roles/openshift_certificate_expiry/filter_plugins/oo_cert_expiry.py @@ -35,7 +35,7 @@ Example playbook usage: become: no run_once: yes delegate_to: localhost - when: "{{ openshift_certificate_expiry_save_json_results|bool }}" + when: openshift_certificate_expiry_save_json_results|bool copy: content: "{{ hostvars|oo_cert_expiry_results_to_json() }}" dest: "{{ openshift_certificate_expiry_json_results_path }}" diff --git a/roles/openshift_certificate_expiry/tasks/main.yml b/roles/openshift_certificate_expiry/tasks/main.yml index 139d5de6e..b5234bd1e 100644 --- a/roles/openshift_certificate_expiry/tasks/main.yml +++ b/roles/openshift_certificate_expiry/tasks/main.yml @@ -13,12 +13,12 @@ src: cert-expiry-table.html.j2 dest: "{{ openshift_certificate_expiry_html_report_path }}" delegate_to: localhost - when: "{{ openshift_certificate_expiry_generate_html_report|bool }}" + when: openshift_certificate_expiry_generate_html_report|bool - name: Generate the result JSON string run_once: yes set_fact: json_result_string="{{ hostvars|oo_cert_expiry_results_to_json(play_hosts) }}" - when: "{{ openshift_certificate_expiry_save_json_results|bool }}" + when: openshift_certificate_expiry_save_json_results|bool - name: Generate results JSON file become: no @@ -27,4 +27,4 @@ src: save_json_results.j2 dest: "{{ openshift_certificate_expiry_json_results_path }}" delegate_to: localhost - when: "{{ openshift_certificate_expiry_save_json_results|bool }}" + when: openshift_certificate_expiry_save_json_results|bool |