summaryrefslogtreecommitdiffstats
path: root/roles/openshift_health_checker/action_plugins/openshift_health_check.py
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-09-12 23:15:37 -0400
committerGitHub <noreply@github.com>2017-09-12 23:15:37 -0400
commitda1b27cbc9294993343c6dee3065a6b57aa148c2 (patch)
treeddaef75a6e267689c873a1e8e886cd362ba3ff0b /roles/openshift_health_checker/action_plugins/openshift_health_check.py
parent6078b3b18e50947d88195ae47285e37a3581bc35 (diff)
parent5f54a91de69bafa70fc4e2657c8bdd8a82c54f11 (diff)
downloadopenshift-da1b27cbc9294993343c6dee3065a6b57aa148c2.tar.gz
openshift-da1b27cbc9294993343c6dee3065a6b57aa148c2.tar.bz2
openshift-da1b27cbc9294993343c6dee3065a6b57aa148c2.tar.xz
openshift-da1b27cbc9294993343c6dee3065a6b57aa148c2.zip
Merge pull request #5365 from sosiouxme/20170908-disconnected-image-check
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_health_checker/action_plugins/openshift_health_check.py')
-rw-r--r--roles/openshift_health_checker/action_plugins/openshift_health_check.py2
1 files changed, 1 insertions, 1 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 8d35db6b5..d02a43655 100644
--- a/roles/openshift_health_checker/action_plugins/openshift_health_check.py
+++ b/roles/openshift_health_checker/action_plugins/openshift_health_check.py
@@ -187,7 +187,7 @@ def normalize(checks):
def run_check(name, check, user_disabled_checks):
"""Run a single check if enabled and return a result dict."""
- if name in user_disabled_checks:
+ if name in user_disabled_checks or '*' in user_disabled_checks:
return dict(skipped=True, skipped_reason="Disabled by user request")
# pylint: disable=broad-except; capturing exceptions broadly is intentional,