Remove openshift.common.{is_atomic|is_containerized}

We set these variables using facts in init, no need
to duplicate the logic all around the codebase.

3 files changed, 7 insertions, 7 deletions

diff --git a/roles/openshift_health_checker/openshift_checks/docker_image_availability.py b/roles/openshift_health_checker/openshift_checks/docker_image_availability.py
index 4f91f6bb3..744b79c1a 100644
--- a/roles/openshift_health_checker/openshift_checks/docker_image_availability.py
+++ b/roles/openshift_health_checker/openshift_checks/docker_image_availability.py
@@ -160,7 +160,7 @@ class DockerImageAvailability(DockerHostMixin, OpenShiftCheck):
                 required.add(self._registry_console_image(image_tag, image_info))
 
         # images for containerized components
-        if self.get_var("openshift", "common", "is_containerized"):
+        if self.get_var("openshift_is_containerized"):
             components = set()
             if 'oo_nodes_to_config' in host_groups:
                 components.update(["node", "openvswitch"])
diff --git a/roles/openshift_health_checker/openshift_checks/etcd_traffic.py b/roles/openshift_health_checker/openshift_checks/etcd_traffic.py
index 8b20ccb49..b56d2092b 100644
--- a/roles/openshift_health_checker/openshift_checks/etcd_traffic.py
+++ b/roles/openshift_health_checker/openshift_checks/etcd_traffic.py
@@ -20,8 +20,8 @@ class EtcdTraffic(OpenShiftCheck):
         return super(EtcdTraffic, self).is_active() and valid_group_names and valid_version
 
     def run(self):
-        is_containerized = self.get_var("openshift", "common", "is_containerized")
-        unit = "etcd_container" if is_containerized else "etcd"
+        openshift_is_containerized = self.get_var("openshift_is_containerized")
+        unit = "etcd_container" if openshift_is_containerized else "etcd"
 
         log_matchers = [{
             "start_regexp": r"Starting Etcd Server",
diff --git a/roles/openshift_health_checker/openshift_checks/mixins.py b/roles/openshift_health_checker/openshift_checks/mixins.py
index cfbdea303..567162be1 100644
--- a/roles/openshift_health_checker/openshift_checks/mixins.py
+++ b/roles/openshift_health_checker/openshift_checks/mixins.py
@@ -10,8 +10,8 @@ class NotContainerizedMixin(object):
 
     def is_active(self):
         """Only run on non-containerized hosts."""
-        is_containerized = self.get_var("openshift", "common", "is_containerized")
-        return super(NotContainerizedMixin, self).is_active() and not is_containerized
+        openshift_is_containerized = self.get_var("openshift_is_containerized")
+        return super(NotContainerizedMixin, self).is_active() and not openshift_is_containerized
 
 
 class DockerHostMixin(object):
@@ -23,7 +23,7 @@ class DockerHostMixin(object):
         """Only run on hosts that depend on Docker."""
         group_names = set(self.get_var("group_names", default=[]))
         needs_docker = set(["oo_nodes_to_config"])
-        if self.get_var("openshift.common.is_containerized"):
+        if self.get_var("openshift_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))
 
@@ -33,7 +33,7 @@ class DockerHostMixin(object):
         (which would not be able to install but should already have them).
         Returns: msg, failed
         """
-        if self.get_var("openshift", "common", "is_atomic"):
+        if self.get_var("openshift_is_atomic"):
             return "", False
 
         # NOTE: we would use the "package" module but it's actually an action plugin