Remove openshift.common.service_type

This commit removes openshift.common.service_type
in favor of openshift_service_type.

This commit also removes r_openshift_excluder_service_type
from plays in favor of using the role's defaults.

8 files changed, 31 insertions, 14 deletions

diff --git a/roles/openshift_health_checker/defaults/main.yml b/roles/openshift_health_checker/defaults/main.yml
new file mode 100644
index 000000000..f25a0dc79
--- /dev/null
+++ b/roles/openshift_health_checker/defaults/main.yml
@@ -0,0 +1,6 @@
+---
+openshift_service_type_dict:
+  origin: origin
+  openshift-enterprise: atomic-openshift
+
+openshift_service_type: "{{ openshift_service_type_dict[openshift_deployment_type] }}"
diff --git a/roles/openshift_health_checker/openshift_checks/package_availability.py b/roles/openshift_health_checker/openshift_checks/package_availability.py
index 090e438ff..980e23f27 100644
--- a/roles/openshift_health_checker/openshift_checks/package_availability.py
+++ b/roles/openshift_health_checker/openshift_checks/package_availability.py
@@ -15,7 +15,9 @@ class PackageAvailability(NotContainerizedMixin, OpenShiftCheck):
         return super(PackageAvailability, self).is_active() and self.get_var("ansible_pkg_mgr") == "yum"
 
     def run(self):
-        rpm_prefix = self.get_var("openshift", "common", "service_type")
+        rpm_prefix = self.get_var("openshift_service_type")
+        if self._templar is not None:
+            rpm_prefix = self._templar.template(rpm_prefix)
         group_names = self.get_var("group_names", default=[])
 
         packages = set()
diff --git a/roles/openshift_health_checker/openshift_checks/package_version.py b/roles/openshift_health_checker/openshift_checks/package_version.py
index 13a91dadf..f3a628e28 100644
--- a/roles/openshift_health_checker/openshift_checks/package_version.py
+++ b/roles/openshift_health_checker/openshift_checks/package_version.py
@@ -41,7 +41,9 @@ class PackageVersion(NotContainerizedMixin, OpenShiftCheck):
         return super(PackageVersion, self).is_active() and master_or_node
 
     def run(self):
-        rpm_prefix = self.get_var("openshift", "common", "service_type")
+        rpm_prefix = self.get_var("openshift_service_type")
+        if self._templar is not None:
+            rpm_prefix = self._templar.template(rpm_prefix)
         openshift_release = self.get_var("openshift_release", default='')
         deployment_type = self.get_var("openshift_deployment_type")
         check_multi_minor_release = deployment_type in ['openshift-enterprise']
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 ec46c3b4b..fc333dfd4 100644
--- a/roles/openshift_health_checker/test/docker_image_availability_test.py
+++ b/roles/openshift_health_checker/test/docker_image_availability_test.py
@@ -8,12 +8,12 @@ def task_vars():
     return dict(
         openshift=dict(
             common=dict(
-                service_type='origin',
                 is_containerized=False,
                 is_atomic=False,
             ),
             docker=dict(),
         ),
+        openshift_service_type='origin',
         openshift_deployment_type='origin',
         openshift_image_tag='',
         group_names=['oo_nodes_to_config', 'oo_masters_to_config'],
diff --git a/roles/openshift_health_checker/test/etcd_traffic_test.py b/roles/openshift_health_checker/test/etcd_traffic_test.py
index dd6f4ad81..a29dc166b 100644
--- a/roles/openshift_health_checker/test/etcd_traffic_test.py
+++ b/roles/openshift_health_checker/test/etcd_traffic_test.py
@@ -37,8 +37,9 @@ def test_log_matches_high_traffic_msg(group_names, matched, failed, extra_words)
     task_vars = dict(
         group_names=group_names,
         openshift=dict(
-            common=dict(service_type="origin", is_containerized=False),
-        )
+            common=dict(is_containerized=False),
+        ),
+        openshift_service_type="origin"
     )
 
     result = EtcdTraffic(execute_module, task_vars).run()
diff --git a/roles/openshift_health_checker/test/ovs_version_test.py b/roles/openshift_health_checker/test/ovs_version_test.py
index 6f0457549..dd98ff4d8 100644
--- a/roles/openshift_health_checker/test/ovs_version_test.py
+++ b/roles/openshift_health_checker/test/ovs_version_test.py
@@ -10,10 +10,11 @@ def test_openshift_version_not_supported():
     openshift_release = '111.7.0'
 
     task_vars = dict(
-        openshift=dict(common=dict(service_type='origin')),
+        openshift=dict(common=dict()),
         openshift_release=openshift_release,
         openshift_image_tag='v' + openshift_release,
         openshift_deployment_type='origin',
+        openshift_service_type='origin'
     )
 
     with pytest.raises(OpenShiftCheckException) as excinfo:
@@ -27,9 +28,10 @@ def test_invalid_openshift_release_format():
         return {}
 
     task_vars = dict(
-        openshift=dict(common=dict(service_type='origin')),
+        openshift=dict(common=dict()),
         openshift_image_tag='v0',
         openshift_deployment_type='origin',
+        openshift_service_type='origin'
     )
 
     with pytest.raises(OpenShiftCheckException) as excinfo:
@@ -47,9 +49,10 @@ def test_invalid_openshift_release_format():
 ])
 def test_ovs_package_version(openshift_release, expected_ovs_version):
     task_vars = dict(
-        openshift=dict(common=dict(service_type='origin')),
+        openshift=dict(common=dict()),
         openshift_release=openshift_release,
         openshift_image_tag='v' + openshift_release,
+        openshift_service_type='origin'
     )
     return_value = {}  # note: check.execute_module modifies return hash contents
 
diff --git a/roles/openshift_health_checker/test/package_availability_test.py b/roles/openshift_health_checker/test/package_availability_test.py
index 9815acb38..a1e6e0879 100644
--- a/roles/openshift_health_checker/test/package_availability_test.py
+++ b/roles/openshift_health_checker/test/package_availability_test.py
@@ -19,13 +19,13 @@ def test_is_active(pkg_mgr, is_containerized, is_active):
 
 @pytest.mark.parametrize('task_vars,must_have_packages,must_not_have_packages', [
     (
-        dict(openshift=dict(common=dict(service_type='openshift'))),
+        dict(openshift_service_type='origin'),
         set(),
         set(['openshift-master', 'openshift-node']),
     ),
     (
         dict(
-            openshift=dict(common=dict(service_type='origin')),
+            openshift_service_type='origin',
             group_names=['oo_masters_to_config'],
         ),
         set(['origin-master']),
@@ -33,7 +33,7 @@ def test_is_active(pkg_mgr, is_containerized, is_active):
     ),
     (
         dict(
-            openshift=dict(common=dict(service_type='atomic-openshift')),
+            openshift_service_type='atomic-openshift',
             group_names=['oo_nodes_to_config'],
         ),
         set(['atomic-openshift-node']),
@@ -41,7 +41,7 @@ def test_is_active(pkg_mgr, is_containerized, is_active):
     ),
     (
         dict(
-            openshift=dict(common=dict(service_type='atomic-openshift')),
+            openshift_service_type='atomic-openshift',
             group_names=['oo_masters_to_config', 'oo_nodes_to_config'],
         ),
         set(['atomic-openshift-master', 'atomic-openshift-node']),
diff --git a/roles/openshift_health_checker/test/package_version_test.py b/roles/openshift_health_checker/test/package_version_test.py
index 3cf4ce033..ea8e02b97 100644
--- a/roles/openshift_health_checker/test/package_version_test.py
+++ b/roles/openshift_health_checker/test/package_version_test.py
@@ -4,9 +4,12 @@ from openshift_checks.package_version import PackageVersion, OpenShiftCheckExcep
 
 
 def task_vars_for(openshift_release, deployment_type):
+    service_type_dict = {'origin': 'origin',
+                         'openshift-enterprise': 'atomic-openshift'}
+    service_type = service_type_dict[deployment_type]
     return dict(
         ansible_pkg_mgr='yum',
-        openshift=dict(common=dict(service_type=deployment_type)),
+        openshift_service_type=service_type,
         openshift_release=openshift_release,
         openshift_image_tag='v' + openshift_release,
         openshift_deployment_type=deployment_type,
@@ -29,7 +32,7 @@ def test_openshift_version_not_supported():
 def test_invalid_openshift_release_format():
     task_vars = dict(
         ansible_pkg_mgr='yum',
-        openshift=dict(common=dict(service_type='origin')),
+        openshift_service_type='origin',
         openshift_image_tag='v0',
         openshift_deployment_type='origin',
     )