summaryrefslogtreecommitdiffstats
path: root/roles/openshift_health_checker/action_plugins
diff options
context:
space:
mode:
authorLuke Meyer <lmeyer@redhat.com>2017-07-20 22:25:47 -0400
committerLuke Meyer <lmeyer@redhat.com>2017-08-02 14:06:37 -0400
commitbf0828bc0f2e3088df20abc77e30a162595e1c22 (patch)
treea46617defefce2cf180666ad441451f54d418704 /roles/openshift_health_checker/action_plugins
parentf6e0126c3cda6622fc2371b3b603108b94ed9d39 (diff)
downloadopenshift-bf0828bc0f2e3088df20abc77e30a162595e1c22.tar.gz
openshift-bf0828bc0f2e3088df20abc77e30a162595e1c22.tar.bz2
openshift-bf0828bc0f2e3088df20abc77e30a162595e1c22.tar.xz
openshift-bf0828bc0f2e3088df20abc77e30a162595e1c22.zip
openshift_checks: add property to track 'changed'
Introduced the 'changed' property for checks that can make changes to track whether they did or not. Rather than the check's own logic having to track this and include it in the result hash, just set the property and have the action plugin insert it in the result hash after running (even if there is an exception). Cleared out a lot of crufty "changed: false" hash entries.
Diffstat (limited to 'roles/openshift_health_checker/action_plugins')
-rw-r--r--roles/openshift_health_checker/action_plugins/openshift_health_check.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/roles/openshift_health_checker/action_plugins/openshift_health_check.py b/roles/openshift_health_checker/action_plugins/openshift_health_check.py
index 23da53940..05e53333d 100644
--- a/roles/openshift_health_checker/action_plugins/openshift_health_check.py
+++ b/roles/openshift_health_checker/action_plugins/openshift_health_check.py
@@ -68,13 +68,15 @@ class ActionModule(ActionBase):
msg=str(e),
)
+ if check.changed:
+ r["changed"] = True
check_results[check_name] = r
- if r.get("failed", False):
- result["failed"] = True
- result["msg"] = "One or more checks failed"
+ result["changed"] = any(r.get("changed") for r in check_results.values())
+ if any(r.get("failed") for r in check_results.values()):
+ result["failed"] = True
+ result["msg"] = "One or more checks failed"
- result["changed"] = any(r.get("changed", False) for r in check_results.values())
return result
def load_known_checks(self, tmp, task_vars):