Merge pull request #5658 from sosiouxme/20171004-groups-for-checks

Automatic merge from submit-queue.

nfs, lb, and groups for checks

Checks have been using the byo group names for determining whether they need to be active or not. Now that everything is running through common initialization, stop assuming byo names and start referring to the common ones.

As a follow-on [bugfix](https://bugzilla.redhat.com/show_bug.cgi?id=1496760), run docker checks only where docker will be: nodes, and containerized master/etcd. We specifically don't want to run against lb or nfs, but a whitelist approach is used.

10 files changed, 38 insertions, 32 deletions

diff --git a/roles/openshift_health_checker/openshift_checks/disk_availability.py b/roles/openshift_health_checker/openshift_checks/disk_availability.py
index cdf56e959..7956559c6 100644
--- a/roles/openshift_health_checker/openshift_checks/disk_availability.py
+++ b/roles/openshift_health_checker/openshift_checks/disk_availability.py
@@ -15,31 +15,31 @@ class DiskAvailability(OpenShiftCheck):
     # https://docs.openshift.org/latest/install_config/install/prerequisites.html#system-requirements
     recommended_disk_space_bytes = {
         '/var': {
-            'masters': 40 * 10**9,
-            'nodes': 15 * 10**9,
-            'etcd': 20 * 10**9,
+            'oo_masters_to_config': 40 * 10**9,
+            'oo_nodes_to_config': 15 * 10**9,
+            'oo_etcd_to_config': 20 * 10**9,
         },
         # Used to copy client binaries into,
         # see roles/openshift_cli/library/openshift_container_binary_sync.py.
         '/usr/local/bin': {
-            'masters': 1 * 10**9,
-            'nodes': 1 * 10**9,
-            'etcd': 1 * 10**9,
+            'oo_masters_to_config': 1 * 10**9,
+            'oo_nodes_to_config': 1 * 10**9,
+            'oo_etcd_to_config': 1 * 10**9,
         },
         # Used as temporary storage in several cases.
         tempfile.gettempdir(): {
-            'masters': 1 * 10**9,
-            'nodes': 1 * 10**9,
-            'etcd': 1 * 10**9,
+            'oo_masters_to_config': 1 * 10**9,
+            'oo_nodes_to_config': 1 * 10**9,
+            'oo_etcd_to_config': 1 * 10**9,
         },
     }
 
     # recommended disk space for each location under an upgrade context
     recommended_disk_upgrade_bytes = {
         '/var': {
-            'masters': 10 * 10**9,
-            'nodes': 5 * 10 ** 9,
-            'etcd': 5 * 10 ** 9,
+            'oo_masters_to_config': 10 * 10**9,
+            'oo_nodes_to_config': 5 * 10 ** 9,
+            'oo_etcd_to_config': 5 * 10 ** 9,
         },
     }
 
@@ -61,9 +61,9 @@ class DiskAvailability(OpenShiftCheck):
             number = float(user_config)
             user_config = {
                 '/var': {
-                    'masters': number,
-                    'nodes': number,
-                    'etcd': number,
+                    'oo_masters_to_config': number,
+                    'oo_nodes_to_config': number,
+                    'oo_etcd_to_config': number,
                 },
             }
         except TypeError:
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 fa07c1dde..63ccadcd1 100644
--- a/roles/openshift_health_checker/openshift_checks/docker_image_availability.py
+++ b/roles/openshift_health_checker/openshift_checks/docker_image_availability.py
@@ -114,7 +114,7 @@ class DockerImageAvailability(DockerHostMixin, OpenShiftCheck):
         # template for images that run on top of OpenShift
         image_url = "{}/{}-{}:{}".format(image_info["namespace"], image_info["name"], "${component}", "${version}")
         image_url = self.get_var("oreg_url", default="") or image_url
-        if 'nodes' in host_groups:
+        if 'oo_nodes_to_config' in host_groups:
             for suffix in NODE_IMAGE_SUFFIXES:
                 required.add(image_url.replace("${component}", suffix).replace("${version}", image_tag))
             # The registry-console is for some reason not prefixed with ose- like the other components.
@@ -125,13 +125,13 @@ class DockerImageAvailability(DockerHostMixin, OpenShiftCheck):
         # images for containerized components
         if self.get_var("openshift", "common", "is_containerized"):
             components = set()
-            if 'nodes' in host_groups:
+            if 'oo_nodes_to_config' in host_groups:
                 components.update(["node", "openvswitch"])
-            if 'masters' in host_groups:  # name is "origin" or "ose"
+            if 'oo_masters_to_config' in host_groups:  # name is "origin" or "ose"
                 components.add(image_info["name"])
             for component in components:
                 required.add("{}/{}:{}".format(image_info["namespace"], component, image_tag))
-            if 'etcd' in host_groups:  # special case, note it is the same for origin/enterprise
+            if 'oo_etcd_to_config' in host_groups:  # special case, note it is the same for origin/enterprise
                 required.add("registry.access.redhat.com/rhel7/etcd")  # and no image tag
 
         return required
diff --git a/roles/openshift_health_checker/openshift_checks/etcd_traffic.py b/roles/openshift_health_checker/openshift_checks/etcd_traffic.py
index b4c8957e9..8b20ccb49 100644
--- a/roles/openshift_health_checker/openshift_checks/etcd_traffic.py
+++ b/roles/openshift_health_checker/openshift_checks/etcd_traffic.py
@@ -12,7 +12,7 @@ class EtcdTraffic(OpenShiftCheck):
     def is_active(self):
         """Skip hosts that do not have etcd in their group names."""
         group_names = self.get_var("group_names", default=[])
-        valid_group_names = "etcd" in group_names
+        valid_group_names = "oo_etcd_to_config" in group_names
 
         version = self.get_major_minor_version(self.get_var("openshift_image_tag"))
         valid_version = version in ((3, 4), (3, 5))
diff --git a/roles/openshift_health_checker/openshift_checks/etcd_volume.py b/roles/openshift_health_checker/openshift_checks/etcd_volume.py
index 79955cb2f..3d75da6f9 100644
--- a/roles/openshift_health_checker/openshift_checks/etcd_volume.py
+++ b/roles/openshift_health_checker/openshift_checks/etcd_volume.py
@@ -15,7 +15,11 @@ class EtcdVolume(OpenShiftCheck):
     etcd_mount_path = "/var/lib/etcd"
 
     def is_active(self):
-        etcd_hosts = self.get_var("groups", "etcd", default=[]) or self.get_var("groups", "masters", default=[]) or []
+        etcd_hosts = (
+            self.get_var("groups", "oo_etcd_to_config", default=[]) or
+            self.get_var("groups", "oo_masters_to_config", default=[]) or
+            []
+        )
         is_etcd_host = self.get_var("ansible_host") in etcd_hosts
         return super(EtcdVolume, self).is_active() and is_etcd_host
 
diff --git a/roles/openshift_health_checker/openshift_checks/logging/fluentd_config.py b/roles/openshift_health_checker/openshift_checks/logging/fluentd_config.py
index d783e6760..e93cc9028 100644
--- a/roles/openshift_health_checker/openshift_checks/logging/fluentd_config.py
+++ b/roles/openshift_health_checker/openshift_checks/logging/fluentd_config.py
@@ -46,7 +46,7 @@ class FluentdConfig(LoggingCheck):
         # if check is running on a master, retrieve all running pods
         # and check any pod's container for the env var "USE_JOURNAL"
         group_names = self.get_var("group_names")
-        if "masters" in group_names:
+        if "oo_masters_to_config" in group_names:
             use_journald = self.check_fluentd_env_var()
 
         docker_info = self.execute_module("docker_info", {})
diff --git a/roles/openshift_health_checker/openshift_checks/memory_availability.py b/roles/openshift_health_checker/openshift_checks/memory_availability.py
index 765ba072d..e7a8ec976 100644
--- a/roles/openshift_health_checker/openshift_checks/memory_availability.py
+++ b/roles/openshift_health_checker/openshift_checks/memory_availability.py
@@ -14,9 +14,9 @@ class MemoryAvailability(OpenShiftCheck):
     # Values taken from the official installation documentation:
     # https://docs.openshift.org/latest/install_config/install/prerequisites.html#system-requirements
     recommended_memory_bytes = {
-        "masters": 16 * GIB,
-        "nodes": 8 * GIB,
-        "etcd": 8 * GIB,
+        "oo_masters_to_config": 16 * GIB,
+        "oo_nodes_to_config": 8 * GIB,
+        "oo_etcd_to_config": 8 * GIB,
     }
     # https://access.redhat.com/solutions/3006511 physical RAM is partly reserved from memtotal
     memtotal_adjustment = 1 * GIB
diff --git a/roles/openshift_health_checker/openshift_checks/mixins.py b/roles/openshift_health_checker/openshift_checks/mixins.py
index b90ebf6dd..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 = "nodes" 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):
         """
diff --git a/roles/openshift_health_checker/openshift_checks/ovs_version.py b/roles/openshift_health_checker/openshift_checks/ovs_version.py
index 363c12def..416805c4d 100644
--- a/roles/openshift_health_checker/openshift_checks/ovs_version.py
+++ b/roles/openshift_health_checker/openshift_checks/ovs_version.py
@@ -24,7 +24,7 @@ class OvsVersion(NotContainerizedMixin, OpenShiftCheck):
     def is_active(self):
         """Skip hosts that do not have package requirements."""
         group_names = self.get_var("group_names", default=[])
-        master_or_node = 'masters' in group_names or 'nodes' in group_names
+        master_or_node = 'oo_masters_to_config' in group_names or 'oo_nodes_to_config' in group_names
         return super(OvsVersion, self).is_active() and master_or_node
 
     def run(self):
diff --git a/roles/openshift_health_checker/openshift_checks/package_availability.py b/roles/openshift_health_checker/openshift_checks/package_availability.py
index 21355c2f0..090e438ff 100644
--- a/roles/openshift_health_checker/openshift_checks/package_availability.py
+++ b/roles/openshift_health_checker/openshift_checks/package_availability.py
@@ -20,9 +20,9 @@ class PackageAvailability(NotContainerizedMixin, OpenShiftCheck):
 
         packages = set()
 
-        if "masters" in group_names:
+        if "oo_masters_to_config" in group_names:
             packages.update(self.master_packages(rpm_prefix))
-        if "nodes" in group_names:
+        if "oo_nodes_to_config" in group_names:
             packages.update(self.node_packages(rpm_prefix))
 
         args = {"packages": sorted(set(packages))}
diff --git a/roles/openshift_health_checker/openshift_checks/package_version.py b/roles/openshift_health_checker/openshift_checks/package_version.py
index d4aec3ed8..2f09b22fc 100644
--- a/roles/openshift_health_checker/openshift_checks/package_version.py
+++ b/roles/openshift_health_checker/openshift_checks/package_version.py
@@ -36,7 +36,7 @@ class PackageVersion(NotContainerizedMixin, OpenShiftCheck):
     def is_active(self):
         """Skip hosts that do not have package requirements."""
         group_names = self.get_var("group_names", default=[])
-        master_or_node = 'masters' in group_names or 'nodes' in group_names
+        master_or_node = 'oo_masters_to_config' in group_names or 'oo_nodes_to_config' in group_names
         return super(PackageVersion, self).is_active() and master_or_node
 
     def run(self):