summaryrefslogtreecommitdiffstats
path: root/roles/openshift_health_checker/openshift_checks
diff options
context:
space:
mode:
authorLuke Meyer <lmeyer@redhat.com>2017-10-04 10:35:08 -0400
committerLuke Meyer <lmeyer@redhat.com>2017-10-04 10:53:21 -0400
commit776b0d9478d92c11c5dd285c758ffae668674f8e (patch)
treec81e188bfa9595e57a36f40fa710dd2eada6c5a0 /roles/openshift_health_checker/openshift_checks
parent7edc17b56309d259634331527bf5f343f45baeaf (diff)
downloadopenshift-776b0d9478d92c11c5dd285c758ffae668674f8e.tar.gz
openshift-776b0d9478d92c11c5dd285c758ffae668674f8e.tar.bz2
openshift-776b0d9478d92c11c5dd285c758ffae668674f8e.tar.xz
openshift-776b0d9478d92c11c5dd285c758ffae668674f8e.zip
openshift_checks: lb and nfs do not need docker
fixes bug 1496760 https://bugzilla.redhat.com/show_bug.cgi?id=1496760
Diffstat (limited to 'roles/openshift_health_checker/openshift_checks')
-rw-r--r--roles/openshift_health_checker/openshift_checks/mixins.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/roles/openshift_health_checker/openshift_checks/mixins.py b/roles/openshift_health_checker/openshift_checks/mixins.py
index f175b86ad..cfbdea303 100644
--- a/roles/openshift_health_checker/openshift_checks/mixins.py
+++ b/roles/openshift_health_checker/openshift_checks/mixins.py
@@ -21,9 +21,11 @@ class DockerHostMixin(object):
def is_active(self):
"""Only run on hosts that depend on Docker."""
- is_containerized = self.get_var("openshift", "common", "is_containerized")
- is_node = "oo_nodes_to_config" in self.get_var("group_names", default=[])
- return super(DockerHostMixin, self).is_active() and (is_containerized or is_node)
+ group_names = set(self.get_var("group_names", default=[]))
+ needs_docker = set(["oo_nodes_to_config"])
+ if self.get_var("openshift.common.is_containerized"):
+ needs_docker.update(["oo_masters_to_config", "oo_etcd_to_config"])
+ return super(DockerHostMixin, self).is_active() and bool(group_names.intersection(needs_docker))
def ensure_dependencies(self):
"""