Merge pull request #6516 from mgugino-upstream-stage/defact-is-containerized

Automatic merge from submit-queue.

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.

10 files changed, 41 insertions, 58 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
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 fc333dfd4..9fd6e049d 100644
--- a/roles/openshift_health_checker/test/docker_image_availability_test.py
+++ b/roles/openshift_health_checker/test/docker_image_availability_test.py
@@ -6,13 +6,8 @@ from openshift_checks.docker_image_availability import DockerImageAvailability,
 @pytest.fixture()
 def task_vars():
     return dict(
-        openshift=dict(
-            common=dict(
-                is_containerized=False,
-                is_atomic=False,
-            ),
-            docker=dict(),
-        ),
+        openshift_is_atomic=False,
+        openshift_is_containerized=False,
         openshift_service_type='origin',
         openshift_deployment_type='origin',
         openshift_image_tag='',
@@ -20,7 +15,7 @@ def task_vars():
     )
 
 
-@pytest.mark.parametrize('deployment_type, is_containerized, group_names, expect_active', [
+@pytest.mark.parametrize('deployment_type, openshift_is_containerized, group_names, expect_active', [
     ("invalid", True, [], False),
     ("", True, [], False),
     ("origin", False, [], False),
@@ -30,20 +25,20 @@ def task_vars():
     ("origin", True, ["nfs"], False),
     ("openshift-enterprise", True, ["lb"], False),
 ])
-def test_is_active(task_vars, deployment_type, is_containerized, group_names, expect_active):
+def test_is_active(task_vars, deployment_type, openshift_is_containerized, group_names, expect_active):
     task_vars['openshift_deployment_type'] = deployment_type
-    task_vars['openshift']['common']['is_containerized'] = is_containerized
+    task_vars['openshift_is_containerized'] = openshift_is_containerized
     task_vars['group_names'] = group_names
     assert DockerImageAvailability(None, task_vars).is_active() == expect_active
 
 
-@pytest.mark.parametrize("is_containerized,is_atomic", [
+@pytest.mark.parametrize("openshift_is_containerized,openshift_is_atomic", [
     (True, True),
     (False, False),
     (True, False),
     (False, True),
 ])
-def test_all_images_available_locally(task_vars, is_containerized, is_atomic):
+def test_all_images_available_locally(task_vars, openshift_is_containerized, openshift_is_atomic):
     def execute_module(module_name, module_args, *_):
         if module_name == "yum":
             return {}
@@ -55,8 +50,8 @@ def test_all_images_available_locally(task_vars, is_containerized, is_atomic):
             'images': [module_args['name']],
         }
 
-    task_vars['openshift']['common']['is_containerized'] = is_containerized
-    task_vars['openshift']['common']['is_atomic'] = is_atomic
+    task_vars['openshift_is_containerized'] = openshift_is_containerized
+    task_vars['openshift_is_atomic'] = openshift_is_atomic
     result = DockerImageAvailability(execute_module, task_vars).run()
 
     assert not result.get('failed', False)
@@ -172,7 +167,7 @@ def test_registry_availability(image, registries, connection_test_failed, skopeo
     assert expect_registries_reached == check.reachable_registries
 
 
-@pytest.mark.parametrize("deployment_type, is_containerized, groups, oreg_url, expected", [
+@pytest.mark.parametrize("deployment_type, openshift_is_containerized, groups, oreg_url, expected", [
     (  # standard set of stuff required on nodes
         "origin", False, ['oo_nodes_to_config'], "",
         set([
@@ -232,14 +227,10 @@ def test_registry_availability(image, registries, connection_test_failed, skopeo
     ),
 
 ])
-def test_required_images(deployment_type, is_containerized, groups, oreg_url, expected):
+def test_required_images(deployment_type, openshift_is_containerized, groups, oreg_url, expected):
     task_vars = dict(
-        openshift=dict(
-            common=dict(
-                is_containerized=is_containerized,
-                is_atomic=False,
-            ),
-        ),
+        openshift_is_containerized=openshift_is_containerized,
+        openshift_is_atomic=False,
         openshift_deployment_type=deployment_type,
         group_names=groups,
         oreg_url=oreg_url,
@@ -287,11 +278,7 @@ def test_registry_console_image(task_vars, expected):
 
 def test_containerized_etcd():
     task_vars = dict(
-        openshift=dict(
-            common=dict(
-                is_containerized=True,
-            ),
-        ),
+        openshift_is_containerized=True,
         openshift_deployment_type="origin",
         group_names=['oo_etcd_to_config'],
     )
diff --git a/roles/openshift_health_checker/test/docker_storage_test.py b/roles/openshift_health_checker/test/docker_storage_test.py
index 8fa68c378..33a5dd90a 100644
--- a/roles/openshift_health_checker/test/docker_storage_test.py
+++ b/roles/openshift_health_checker/test/docker_storage_test.py
@@ -4,21 +4,21 @@ from openshift_checks import OpenShiftCheckException
 from openshift_checks.docker_storage import DockerStorage
 
 
-@pytest.mark.parametrize('is_containerized, group_names, is_active', [
+@pytest.mark.parametrize('openshift_is_containerized, group_names, is_active', [
     (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):
+def test_is_active(openshift_is_containerized, group_names, is_active):
     task_vars = dict(
-        openshift=dict(common=dict(is_containerized=is_containerized)),
+        openshift_is_containerized=openshift_is_containerized,
         group_names=group_names,
     )
     assert DockerStorage(None, task_vars).is_active() == is_active
 
 
 def non_atomic_task_vars():
-    return {"openshift": {"common": {"is_atomic": False}}}
+    return {"openshift_is_atomic": False}
 
 
 @pytest.mark.parametrize('docker_info, failed, expect_msg', [
diff --git a/roles/openshift_health_checker/test/etcd_traffic_test.py b/roles/openshift_health_checker/test/etcd_traffic_test.py
index a29dc166b..583c4c8dd 100644
--- a/roles/openshift_health_checker/test/etcd_traffic_test.py
+++ b/roles/openshift_health_checker/test/etcd_traffic_test.py
@@ -36,9 +36,7 @@ def test_log_matches_high_traffic_msg(group_names, matched, failed, extra_words)
 
     task_vars = dict(
         group_names=group_names,
-        openshift=dict(
-            common=dict(is_containerized=False),
-        ),
+        openshift_is_containerized=False,
         openshift_service_type="origin"
     )
 
@@ -50,15 +48,13 @@ def test_log_matches_high_traffic_msg(group_names, matched, failed, extra_words)
     assert result.get("failed", False) == failed
 
 
-@pytest.mark.parametrize('is_containerized,expected_unit_value', [
+@pytest.mark.parametrize('openshift_is_containerized,expected_unit_value', [
     (False, "etcd"),
     (True, "etcd_container"),
 ])
-def test_systemd_unit_matches_deployment_type(is_containerized, expected_unit_value):
+def test_systemd_unit_matches_deployment_type(openshift_is_containerized, expected_unit_value):
     task_vars = dict(
-        openshift=dict(
-            common=dict(is_containerized=is_containerized),
-        )
+        openshift_is_containerized=openshift_is_containerized
     )
 
     def execute_module(module_name, args, *_):
diff --git a/roles/openshift_health_checker/test/mixins_test.py b/roles/openshift_health_checker/test/mixins_test.py
index b1a41ca3c..b5d6f2e95 100644
--- a/roles/openshift_health_checker/test/mixins_test.py
+++ b/roles/openshift_health_checker/test/mixins_test.py
@@ -10,8 +10,8 @@ class NotContainerizedCheck(NotContainerizedMixin, OpenShiftCheck):
 
 
 @pytest.mark.parametrize('task_vars,expected', [
-    (dict(openshift=dict(common=dict(is_containerized=False))), True),
-    (dict(openshift=dict(common=dict(is_containerized=True))), False),
+    (dict(openshift_is_containerized=False), True),
+    (dict(openshift_is_containerized=True), False),
 ])
 def test_is_active(task_vars, expected):
     assert NotContainerizedCheck(None, task_vars).is_active() == expected
@@ -20,4 +20,4 @@ def test_is_active(task_vars, expected):
 def test_is_active_missing_task_vars():
     with pytest.raises(OpenShiftCheckException) as excinfo:
         NotContainerizedCheck().is_active()
-    assert 'is_containerized' in str(excinfo.value)
+    assert 'openshift_is_containerized' in str(excinfo.value)
diff --git a/roles/openshift_health_checker/test/ovs_version_test.py b/roles/openshift_health_checker/test/ovs_version_test.py
index dd98ff4d8..0238f49d5 100644
--- a/roles/openshift_health_checker/test/ovs_version_test.py
+++ b/roles/openshift_health_checker/test/ovs_version_test.py
@@ -70,7 +70,7 @@ def test_ovs_package_version(openshift_release, expected_ovs_version):
     assert result is return_value
 
 
-@pytest.mark.parametrize('group_names,is_containerized,is_active', [
+@pytest.mark.parametrize('group_names,openshift_is_containerized,is_active', [
     (['oo_masters_to_config'], False, True),
     # ensure check is skipped on containerized installs
     (['oo_masters_to_config'], True, False),
@@ -82,9 +82,9 @@ def test_ovs_package_version(openshift_release, expected_ovs_version):
     (['lb'], False, False),
     (['nfs'], False, False),
 ])
-def test_ovs_version_skip_when_not_master_nor_node(group_names, is_containerized, is_active):
+def test_ovs_version_skip_when_not_master_nor_node(group_names, openshift_is_containerized, is_active):
     task_vars = dict(
         group_names=group_names,
-        openshift=dict(common=dict(is_containerized=is_containerized)),
+        openshift_is_containerized=openshift_is_containerized,
     )
     assert OvsVersion(None, task_vars).is_active() == is_active
diff --git a/roles/openshift_health_checker/test/package_availability_test.py b/roles/openshift_health_checker/test/package_availability_test.py
index a1e6e0879..52740093d 100644
--- a/roles/openshift_health_checker/test/package_availability_test.py
+++ b/roles/openshift_health_checker/test/package_availability_test.py
@@ -3,16 +3,16 @@ import pytest
 from openshift_checks.package_availability import PackageAvailability
 
 
-@pytest.mark.parametrize('pkg_mgr,is_containerized,is_active', [
+@pytest.mark.parametrize('pkg_mgr,openshift_is_containerized,is_active', [
     ('yum', False, True),
     ('yum', True, False),
     ('dnf', True, False),
     ('dnf', False, False),
 ])
-def test_is_active(pkg_mgr, is_containerized, is_active):
+def test_is_active(pkg_mgr, openshift_is_containerized, is_active):
     task_vars = dict(
         ansible_pkg_mgr=pkg_mgr,
-        openshift=dict(common=dict(is_containerized=is_containerized)),
+        openshift_is_containerized=openshift_is_containerized,
     )
     assert PackageAvailability(None, task_vars).is_active() == is_active
 
diff --git a/roles/openshift_health_checker/test/package_version_test.py b/roles/openshift_health_checker/test/package_version_test.py
index ea8e02b97..d2916f617 100644
--- a/roles/openshift_health_checker/test/package_version_test.py
+++ b/roles/openshift_health_checker/test/package_version_test.py
@@ -99,7 +99,7 @@ def test_docker_package_version(deployment_type, openshift_release, expected_doc
     assert result == return_value
 
 
-@pytest.mark.parametrize('group_names,is_containerized,is_active', [
+@pytest.mark.parametrize('group_names,openshift_is_containerized,is_active', [
     (['oo_masters_to_config'], False, True),
     # ensure check is skipped on containerized installs
     (['oo_masters_to_config'], True, False),
@@ -111,9 +111,9 @@ def test_docker_package_version(deployment_type, openshift_release, expected_doc
     (['lb'], False, False),
     (['nfs'], False, False),
 ])
-def test_package_version_skip_when_not_master_nor_node(group_names, is_containerized, is_active):
+def test_package_version_skip_when_not_master_nor_node(group_names, openshift_is_containerized, is_active):
     task_vars = dict(
         group_names=group_names,
-        openshift=dict(common=dict(is_containerized=is_containerized)),
+        openshift_is_containerized=openshift_is_containerized,
     )
     assert PackageVersion(None, task_vars).is_active() == is_active