diff options
| author | Tim Bielawa <tbielawa@redhat.com> | 2016-11-18 09:12:18 -0800 |
|---|---|---|
| committer | Tim Bielawa <tbielawa@redhat.com> | 2016-12-15 10:01:03 -0800 |
| commit | 4bde8aa816fdca2aafe7626468e211c426caa7b9 (patch) | |
| tree | f8e2f47b89ea22bff2bc39a0599fdaa5b07f494b | |
| parent | 002fdef1769baccdd6c90a4caa8c0028ec9559db (diff) | |
| download | openshift-4bde8aa816fdca2aafe7626468e211c426caa7b9.tar.gz openshift-4bde8aa816fdca2aafe7626468e211c426caa7b9.tar.bz2 openshift-4bde8aa816fdca2aafe7626468e211c426caa7b9.tar.xz openshift-4bde8aa816fdca2aafe7626468e211c426caa7b9.zip | |
Include 'total' and 'ok' in check results
* Addresses https://bugzilla.redhat.com/show_bug.cgi?id=1389263
| -rw-r--r-- | roles/openshift_certificate_expiry/filter_plugins/oo_cert_expiry.py | 4 | ||||
| -rw-r--r-- | roles/openshift_certificate_expiry/library/openshift_cert_expiry.py | 3 |
2 files changed, 6 insertions, 1 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 bedd23fe8..5f102e960 100644 --- a/roles/openshift_certificate_expiry/filter_plugins/oo_cert_expiry.py +++ b/roles/openshift_certificate_expiry/filter_plugins/oo_cert_expiry.py @@ -51,9 +51,13 @@ Example playbook usage: total_warnings = sum([hostvars[h]['check_results']['summary']['warning'] for h in play_hosts]) total_expired = sum([hostvars[h]['check_results']['summary']['expired'] for h in play_hosts]) + total_ok = sum([hostvars[h]['check_results']['summary']['ok'] for h in play_hosts]) + total_total = sum([hostvars[h]['check_results']['summary']['total'] for h in play_hosts]) json_result['summary']['warning'] = total_warnings json_result['summary']['expired'] = total_expired + json_result['summary']['ok'] = total_ok + json_result['summary']['total'] = total_total return json_result diff --git a/roles/openshift_certificate_expiry/library/openshift_cert_expiry.py b/roles/openshift_certificate_expiry/library/openshift_cert_expiry.py index e838eb2d4..d467d0cc8 100644 --- a/roles/openshift_certificate_expiry/library/openshift_cert_expiry.py +++ b/roles/openshift_certificate_expiry/library/openshift_cert_expiry.py @@ -246,7 +246,8 @@ Return: 'total': len(items), 'ok': 0, 'warning': 0, - 'expired': 0 + 'expired': 0, + 'total': len(items) } summary_results['expired'] = len([c for c in items if c['health'] == 'expired']) |