openshift_checks: use oo group names everywhere

19 files changed, 116 insertions, 112 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..f175b86ad 100644
--- a/roles/openshift_health_checker/openshift_checks/mixins.py
+++ b/roles/openshift_health_checker/openshift_checks/mixins.py
@@ -22,7 +22,7 @@ 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=[])
+        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)
 
     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):
diff --git a/roles/openshift_health_checker/test/disk_availability_test.py b/roles/openshift_health_checker/test/disk_availability_test.py
index 9ae679b79..29a325a17 100644
--- a/roles/openshift_health_checker/test/disk_availability_test.py
+++ b/roles/openshift_health_checker/test/disk_availability_test.py
@@ -4,11 +4,11 @@ from openshift_checks.disk_availability import DiskAvailability, OpenShiftCheckE
 
 
 @pytest.mark.parametrize('group_names,is_active', [
-    (['masters'], True),
-    (['nodes'], True),
-    (['etcd'], True),
-    (['masters', 'nodes'], True),
-    (['masters', 'etcd'], True),
+    (['oo_masters_to_config'], True),
+    (['oo_nodes_to_config'], True),
+    (['oo_etcd_to_config'], True),
+    (['oo_masters_to_config', 'oo_nodes_to_config'], True),
+    (['oo_masters_to_config', 'oo_etcd_to_config'], True),
     ([], False),
     (['lb'], False),
     (['nfs'], False),
@@ -39,7 +39,7 @@ def test_is_active(group_names, is_active):
 ])
 def test_cannot_determine_available_disk(desc, ansible_mounts, expect_chunks):
     task_vars = dict(
-        group_names=['masters'],
+        group_names=['oo_masters_to_config'],
         ansible_mounts=ansible_mounts,
     )
 
@@ -52,7 +52,7 @@ def test_cannot_determine_available_disk(desc, ansible_mounts, expect_chunks):
 
 @pytest.mark.parametrize('group_names,configured_min,ansible_mounts', [
     (
-        ['masters'],
+        ['oo_masters_to_config'],
         0,
         [{
             'mount': '/',
@@ -60,7 +60,7 @@ def test_cannot_determine_available_disk(desc, ansible_mounts, expect_chunks):
         }],
     ),
     (
-        ['nodes'],
+        ['oo_nodes_to_config'],
         0,
         [{
             'mount': '/',
@@ -68,7 +68,7 @@ def test_cannot_determine_available_disk(desc, ansible_mounts, expect_chunks):
         }],
     ),
     (
-        ['etcd'],
+        ['oo_etcd_to_config'],
         0,
         [{
             'mount': '/',
@@ -76,7 +76,7 @@ def test_cannot_determine_available_disk(desc, ansible_mounts, expect_chunks):
         }],
     ),
     (
-        ['etcd'],
+        ['oo_etcd_to_config'],
         1,  # configure lower threshold
         [{
             'mount': '/',
@@ -84,7 +84,7 @@ def test_cannot_determine_available_disk(desc, ansible_mounts, expect_chunks):
         }],
     ),
     (
-        ['etcd'],
+        ['oo_etcd_to_config'],
         0,
         [{
             # not enough space on / ...
@@ -112,7 +112,7 @@ def test_succeeds_with_recommended_disk_space(group_names, configured_min, ansib
 @pytest.mark.parametrize('name,group_names,configured_min,ansible_mounts,expect_chunks', [
     (
         'test with no space available',
-        ['masters'],
+        ['oo_masters_to_config'],
         0,
         [{
             'mount': '/',
@@ -122,7 +122,7 @@ def test_succeeds_with_recommended_disk_space(group_names, configured_min, ansib
     ),
     (
         'test with a higher configured required value',
-        ['masters'],
+        ['oo_masters_to_config'],
         100,  # set a higher threshold
         [{
             'mount': '/',
@@ -132,7 +132,7 @@ def test_succeeds_with_recommended_disk_space(group_names, configured_min, ansib
     ),
     (
         'test with 1GB available, but "0" GB space requirement',
-        ['nodes'],
+        ['oo_nodes_to_config'],
         0,
         [{
             'mount': '/',
@@ -142,7 +142,7 @@ def test_succeeds_with_recommended_disk_space(group_names, configured_min, ansib
     ),
     (
         'test with no space available, but "0" GB space requirement',
-        ['etcd'],
+        ['oo_etcd_to_config'],
         0,
         [{
             'mount': '/',
@@ -152,7 +152,7 @@ def test_succeeds_with_recommended_disk_space(group_names, configured_min, ansib
     ),
     (
         'test with enough space for a node, but not for a master',
-        ['nodes', 'masters'],
+        ['oo_nodes_to_config', 'oo_masters_to_config'],
         0,
         [{
             'mount': '/',
@@ -162,7 +162,7 @@ def test_succeeds_with_recommended_disk_space(group_names, configured_min, ansib
     ),
     (
         'test failure with enough space on "/", but not enough on "/var"',
-        ['etcd'],
+        ['oo_etcd_to_config'],
         0,
         [{
             # enough space on / ...
@@ -194,7 +194,7 @@ def test_fails_with_insufficient_disk_space(name, group_names, configured_min, a
 @pytest.mark.parametrize('name,group_names,context,ansible_mounts,failed,extra_words', [
     (
         'test without enough space for master under "upgrade" context',
-        ['nodes', 'masters'],
+        ['oo_nodes_to_config', 'oo_masters_to_config'],
         "upgrade",
         [{
             'mount': '/',
@@ -206,7 +206,7 @@ def test_fails_with_insufficient_disk_space(name, group_names, configured_min, a
     ),
     (
         'test with enough space for master under "upgrade" context',
-        ['nodes', 'masters'],
+        ['oo_nodes_to_config', 'oo_masters_to_config'],
         "upgrade",
         [{
             'mount': '/',
@@ -218,7 +218,7 @@ def test_fails_with_insufficient_disk_space(name, group_names, configured_min, a
     ),
     (
         'test with not enough space for master, and non-upgrade context',
-        ['nodes', 'masters'],
+        ['oo_nodes_to_config', 'oo_masters_to_config'],
         "health",
         [{
             'mount': '/',
diff --git a/roles/openshift_health_checker/test/docker_image_availability_test.py b/roles/openshift_health_checker/test/docker_image_availability_test.py
index c523ffd5c..25efbda69 100644
--- a/roles/openshift_health_checker/test/docker_image_availability_test.py
+++ b/roles/openshift_health_checker/test/docker_image_availability_test.py
@@ -16,7 +16,7 @@ def task_vars():
         ),
         openshift_deployment_type='origin',
         openshift_image_tag='',
-        group_names=['nodes', 'masters'],
+        group_names=['oo_nodes_to_config', 'oo_masters_to_config'],
     )
 
 
@@ -27,8 +27,8 @@ def task_vars():
     ("", True, [], False),
     ("origin", False, [], False),
     ("openshift-enterprise", False, [], False),
-    ("origin", False, ["nodes", "masters"], True),
-    ("openshift-enterprise", False, ["etcd"], False),
+    ("origin", False, ["oo_nodes_to_config", "oo_masters_to_config"], True),
+    ("openshift-enterprise", False, ["oo_etcd_to_config"], False),
 ])
 def test_is_active(task_vars, deployment_type, is_containerized, group_names, expect_active):
     task_vars['openshift_deployment_type'] = deployment_type
@@ -126,7 +126,7 @@ def test_no_known_registries():
         openshift_docker_additional_registries=["docker.io"],
         openshift_deployment_type="openshift-enterprise",
         openshift_image_tag='latest',
-        group_names=['nodes', 'masters'],
+        group_names=['oo_nodes_to_config', 'oo_masters_to_config'],
     ))
     dia.known_docker_registries = mock_known_docker_registries
     actual = dia.run()
@@ -205,7 +205,7 @@ def test_registry_availability(image, registries, connection_test_failed, skopeo
 
 @pytest.mark.parametrize("deployment_type, is_containerized, groups, oreg_url, expected", [
     (  # standard set of stuff required on nodes
-        "origin", False, ['nodes'], None,
+        "origin", False, ['oo_nodes_to_config'], None,
         set([
             'openshift/origin-pod:vtest',
             'openshift/origin-deployer:vtest',
@@ -215,7 +215,7 @@ def test_registry_availability(image, registries, connection_test_failed, skopeo
         ])
     ),
     (  # set a different URL for images
-        "origin", False, ['nodes'], 'foo.io/openshift/origin-${component}:${version}',
+        "origin", False, ['oo_nodes_to_config'], 'foo.io/openshift/origin-${component}:${version}',
         set([
             'foo.io/openshift/origin-pod:vtest',
             'foo.io/openshift/origin-deployer:vtest',
@@ -225,7 +225,7 @@ def test_registry_availability(image, registries, connection_test_failed, skopeo
         ])
     ),
     (
-        "origin", True, ['nodes', 'masters', 'etcd'], None,
+        "origin", True, ['oo_nodes_to_config', 'oo_masters_to_config', 'oo_etcd_to_config'], None,
         set([
             # images running on top of openshift
             'openshift/origin-pod:vtest',
@@ -241,7 +241,7 @@ def test_registry_availability(image, registries, connection_test_failed, skopeo
         ])
     ),
     (  # enterprise images
-        "openshift-enterprise", True, ['nodes'], 'foo.io/openshift3/ose-${component}:f13ac45',
+        "openshift-enterprise", True, ['oo_nodes_to_config'], 'foo.io/openshift3/ose-${component}:f13ac45',
         set([
             'foo.io/openshift3/ose-pod:f13ac45',
             'foo.io/openshift3/ose-deployer:f13ac45',
@@ -255,7 +255,7 @@ def test_registry_availability(image, registries, connection_test_failed, skopeo
         ])
     ),
     (
-        "openshift-enterprise", True, ['etcd', 'lb'], 'foo.io/openshift3/ose-${component}:f13ac45',
+        "openshift-enterprise", True, ['oo_etcd_to_config', 'lb'], 'foo.io/openshift3/ose-${component}:f13ac45',
         set([
             'registry.access.redhat.com/rhel7/etcd',
             # lb does not yet come in a containerized version
@@ -288,7 +288,7 @@ def test_containerized_etcd():
             ),
         ),
         openshift_deployment_type="origin",
-        group_names=['etcd'],
+        group_names=['oo_etcd_to_config'],
     )
     expected = set(['registry.access.redhat.com/rhel7/etcd'])
     assert expected == DockerImageAvailability(task_vars=task_vars).required_images()
diff --git a/roles/openshift_health_checker/test/docker_storage_test.py b/roles/openshift_health_checker/test/docker_storage_test.py
index e0dccc062..8fa68c378 100644
--- a/roles/openshift_health_checker/test/docker_storage_test.py
+++ b/roles/openshift_health_checker/test/docker_storage_test.py
@@ -5,9 +5,9 @@ from openshift_checks.docker_storage import DockerStorage
 
 
 @pytest.mark.parametrize('is_containerized, group_names, is_active', [
-    (False, ["masters", "etcd"], False),
-    (False, ["masters", "nodes"], True),
-    (True, ["etcd"], True),
+    (False, ["oo_masters_to_config", "oo_etcd_to_config"], False),
+    (False, ["oo_masters_to_config", "oo_nodes_to_config"], True),
+    (True, ["oo_etcd_to_config"], True),
 ])
 def test_is_active(is_containerized, group_names, is_active):
     task_vars = dict(
diff --git a/roles/openshift_health_checker/test/etcd_traffic_test.py b/roles/openshift_health_checker/test/etcd_traffic_test.py
index fae3e578d..dd6f4ad81 100644
--- a/roles/openshift_health_checker/test/etcd_traffic_test.py
+++ b/roles/openshift_health_checker/test/etcd_traffic_test.py
@@ -4,14 +4,14 @@ from openshift_checks.etcd_traffic import EtcdTraffic
 
 
 @pytest.mark.parametrize('group_names,version,is_active', [
-    (['masters'], "3.5", False),
-    (['masters'], "3.6", False),
-    (['nodes'], "3.4", False),
-    (['etcd'], "3.4", True),
-    (['etcd'], "1.5", True),
-    (['etcd'], "3.1", False),
-    (['masters', 'nodes'], "3.5", False),
-    (['masters', 'etcd'], "3.5", True),
+    (['oo_masters_to_config'], "3.5", False),
+    (['oo_masters_to_config'], "3.6", False),
+    (['oo_nodes_to_config'], "3.4", False),
+    (['oo_etcd_to_config'], "3.4", True),
+    (['oo_etcd_to_config'], "1.5", True),
+    (['oo_etcd_to_config'], "3.1", False),
+    (['oo_masters_to_config', 'oo_nodes_to_config'], "3.5", False),
+    (['oo_masters_to_config', 'oo_etcd_to_config'], "3.5", True),
     ([], "3.4", False),
 ])
 def test_is_active(group_names, version, is_active):
@@ -23,9 +23,9 @@ def test_is_active(group_names, version, is_active):
 
 
 @pytest.mark.parametrize('group_names,matched,failed,extra_words', [
-    (["masters"], True, True, ["Higher than normal", "traffic"]),
-    (["masters", "etcd"], False, False, []),
-    (["etcd"], False, False, []),
+    (["oo_masters_to_config"], True, True, ["Higher than normal", "traffic"]),
+    (["oo_masters_to_config", "oo_etcd_to_config"], False, False, []),
+    (["oo_etcd_to_config"], False, False, []),
 ])
 def test_log_matches_high_traffic_msg(group_names, matched, failed, extra_words):
     def execute_module(module_name, *_):
diff --git a/roles/openshift_health_checker/test/fluentd_config_test.py b/roles/openshift_health_checker/test/fluentd_config_test.py
index 10db253bc..b5b4858d6 100644
--- a/roles/openshift_health_checker/test/fluentd_config_test.py
+++ b/roles/openshift_health_checker/test/fluentd_config_test.py
@@ -82,7 +82,7 @@ def test_check_logging_config_non_master(name, use_journald, logging_driver, ext
         return {}
 
     task_vars = dict(
-        group_names=["nodes", "etcd"],
+        group_names=["oo_nodes_to_config", "oo_etcd_to_config"],
         openshift_logging_fluentd_use_journal=use_journald,
         openshift=dict(
             common=dict(config_base=""),
@@ -128,7 +128,7 @@ def test_check_logging_config_non_master_failed(name, use_journald, logging_driv
         return {}
 
     task_vars = dict(
-        group_names=["nodes", "etcd"],
+        group_names=["oo_nodes_to_config", "oo_etcd_to_config"],
         openshift_logging_fluentd_use_journal=use_journald,
         openshift=dict(
             common=dict(config_base=""),
@@ -192,7 +192,7 @@ def test_check_logging_config_master(name, pods, logging_driver, extra_words):
         return {}
 
     task_vars = dict(
-        group_names=["masters"],
+        group_names=["oo_masters_to_config"],
         openshift=dict(
             common=dict(config_base=""),
         ),
@@ -274,7 +274,7 @@ def test_check_logging_config_master_failed(name, pods, logging_driver, words):
         return {}
 
     task_vars = dict(
-        group_names=["masters"],
+        group_names=["oo_masters_to_config"],
         openshift=dict(
             common=dict(config_base=""),
         ),
@@ -331,7 +331,7 @@ def test_check_logging_config_master_fails_on_unscheduled_deployment(name, pods,
         return {}
 
     task_vars = dict(
-        group_names=["masters"],
+        group_names=["oo_masters_to_config"],
         openshift=dict(
             common=dict(config_base=""),
         ),
diff --git a/roles/openshift_health_checker/test/memory_availability_test.py b/roles/openshift_health_checker/test/memory_availability_test.py
index aee2f0416..5ec83dd79 100644
--- a/roles/openshift_health_checker/test/memory_availability_test.py
+++ b/roles/openshift_health_checker/test/memory_availability_test.py
@@ -4,11 +4,11 @@ from openshift_checks.memory_availability import MemoryAvailability
 
 
 @pytest.mark.parametrize('group_names,is_active', [
-    (['masters'], True),
-    (['nodes'], True),
-    (['etcd'], True),
-    (['masters', 'nodes'], True),
-    (['masters', 'etcd'], True),
+    (['oo_masters_to_config'], True),
+    (['oo_nodes_to_config'], True),
+    (['oo_etcd_to_config'], True),
+    (['oo_masters_to_config', 'oo_nodes_to_config'], True),
+    (['oo_masters_to_config', 'oo_etcd_to_config'], True),
     ([], False),
     (['lb'], False),
     (['nfs'], False),
@@ -22,32 +22,32 @@ def test_is_active(group_names, is_active):
 
 @pytest.mark.parametrize('group_names,configured_min,ansible_memtotal_mb', [
     (
-        ['masters'],
+        ['oo_masters_to_config'],
         0,
         17200,
     ),
     (
-        ['nodes'],
+        ['oo_nodes_to_config'],
         0,
         8200,
     ),
     (
-        ['nodes'],
+        ['oo_nodes_to_config'],
         1,  # configure lower threshold
         2000,  # too low for recommended but not for configured
     ),
     (
-        ['nodes'],
+        ['oo_nodes_to_config'],
         2,  # configure threshold where adjustment pushes it over
         1900,
     ),
     (
-        ['etcd'],
+        ['oo_etcd_to_config'],
         0,
         8200,
     ),
     (
-        ['masters', 'nodes'],
+        ['oo_masters_to_config', 'oo_nodes_to_config'],
         0,
         17000,
     ),
@@ -66,43 +66,43 @@ def test_succeeds_with_recommended_memory(group_names, configured_min, ansible_m
 
 @pytest.mark.parametrize('group_names,configured_min,ansible_memtotal_mb,extra_words', [
     (
-        ['masters'],
+        ['oo_masters_to_config'],
         0,
         0,
         ['0.0 GiB'],
     ),
     (
-        ['nodes'],
+        ['oo_nodes_to_config'],
         0,
         100,
         ['0.1 GiB'],
     ),
     (
-        ['nodes'],
+        ['oo_nodes_to_config'],
         24,  # configure higher threshold
         20 * 1024,  # enough to meet recommended but not configured
         ['20.0 GiB'],
     ),
     (
-        ['nodes'],
+        ['oo_nodes_to_config'],
         24,  # configure higher threshold
         22 * 1024,  # not enough for adjustment to push over threshold
         ['22.0 GiB'],
     ),
     (
-        ['etcd'],
+        ['oo_etcd_to_config'],
         0,
         6 * 1024,
         ['6.0 GiB'],
     ),
     (
-        ['etcd', 'masters'],
+        ['oo_etcd_to_config', 'oo_masters_to_config'],
         0,
         9 * 1024,  # enough memory for etcd, not enough for a master
         ['9.0 GiB'],
     ),
     (
-        ['nodes', 'masters'],
+        ['oo_nodes_to_config', 'oo_masters_to_config'],
         0,
         # enough memory for a node, not enough for a master
         11 * 1024,
diff --git a/roles/openshift_health_checker/test/ovs_version_test.py b/roles/openshift_health_checker/test/ovs_version_test.py
index 602f32989..5a82a43bf 100644
--- a/roles/openshift_health_checker/test/ovs_version_test.py
+++ b/roles/openshift_health_checker/test/ovs_version_test.py
@@ -67,14 +67,14 @@ def test_ovs_package_version(openshift_release, expected_ovs_version):
 
 
 @pytest.mark.parametrize('group_names,is_containerized,is_active', [
-    (['masters'], False, True),
+    (['oo_masters_to_config'], False, True),
     # ensure check is skipped on containerized installs
-    (['masters'], True, False),
-    (['nodes'], False, True),
-    (['masters', 'nodes'], False, True),
-    (['masters', 'etcd'], False, True),
+    (['oo_masters_to_config'], True, False),
+    (['oo_nodes_to_config'], False, True),
+    (['oo_masters_to_config', 'oo_nodes_to_config'], False, True),
+    (['oo_masters_to_config', 'oo_etcd_to_config'], False, True),
     ([], False, False),
-    (['etcd'], False, False),
+    (['oo_etcd_to_config'], False, False),
     (['lb'], False, False),
     (['nfs'], False, False),
 ])
diff --git a/roles/openshift_health_checker/test/package_availability_test.py b/roles/openshift_health_checker/test/package_availability_test.py
index b34e8fbfc..9815acb38 100644
--- a/roles/openshift_health_checker/test/package_availability_test.py
+++ b/roles/openshift_health_checker/test/package_availability_test.py
@@ -26,7 +26,7 @@ def test_is_active(pkg_mgr, is_containerized, is_active):
     (
         dict(
             openshift=dict(common=dict(service_type='origin')),
-            group_names=['masters'],
+            group_names=['oo_masters_to_config'],
         ),
         set(['origin-master']),
         set(['origin-node']),
@@ -34,7 +34,7 @@ def test_is_active(pkg_mgr, is_containerized, is_active):
     (
         dict(
             openshift=dict(common=dict(service_type='atomic-openshift')),
-            group_names=['nodes'],
+            group_names=['oo_nodes_to_config'],
         ),
         set(['atomic-openshift-node']),
         set(['atomic-openshift-master']),
@@ -42,7 +42,7 @@ def test_is_active(pkg_mgr, is_containerized, is_active):
     (
         dict(
             openshift=dict(common=dict(service_type='atomic-openshift')),
-            group_names=['masters', 'nodes'],
+            group_names=['oo_masters_to_config', 'oo_nodes_to_config'],
         ),
         set(['atomic-openshift-master', 'atomic-openshift-node']),
         set(),
diff --git a/roles/openshift_health_checker/test/package_version_test.py b/roles/openshift_health_checker/test/package_version_test.py
index 8564cd4db..3cf4ce033 100644
--- a/roles/openshift_health_checker/test/package_version_test.py
+++ b/roles/openshift_health_checker/test/package_version_test.py
@@ -97,14 +97,14 @@ def test_docker_package_version(deployment_type, openshift_release, expected_doc
 
 
 @pytest.mark.parametrize('group_names,is_containerized,is_active', [
-    (['masters'], False, True),
+    (['oo_masters_to_config'], False, True),
     # ensure check is skipped on containerized installs
-    (['masters'], True, False),
-    (['nodes'], False, True),
-    (['masters', 'nodes'], False, True),
-    (['masters', 'etcd'], False, True),
+    (['oo_masters_to_config'], True, False),
+    (['oo_nodes_to_config'], False, True),
+    (['oo_masters_to_config', 'oo_nodes_to_config'], False, True),
+    (['oo_masters_to_config', 'oo_etcd_to_config'], False, True),
     ([], False, False),
-    (['etcd'], False, False),
+    (['oo_etcd_to_config'], False, False),
     (['lb'], False, False),
     (['nfs'], False, False),
 ])