Drop OVS from package version check

OVS is now installed using SDN daemonset, so RPM is no longer required

roles/openshift_health_checker/openshift_checks/ovs_version.py

@@ -1,47 +0,0 @@
-"""
-Ansible module for determining if an installed version of Open vSwitch is incompatible with the
-currently installed version of OpenShift.
-"""
-
-from openshift_checks import OpenShiftCheck
-from openshift_checks.mixins import NotContainerizedMixin
-
-
-class OvsVersion(NotContainerizedMixin, OpenShiftCheck):
-    """Check that packages in a package_list are installed on the host
-    and are the correct version as determined by an OpenShift installation.
-    """
-
-    name = "ovs_version"
-    tags = ["health"]
-
-    openshift_to_ovs_version = {
-        (3, 4): "2.4",
-        (3, 5): ["2.6", "2.7"],
-        (3, 6): ["2.6", "2.7", "2.8", "2.9"],
-        (3, 7): ["2.6", "2.7", "2.8", "2.9"],
-        (3, 8): ["2.6", "2.7", "2.8", "2.9"],
-        (3, 9): ["2.6", "2.7", "2.8", "2.9"],
-        (3, 10): ["2.6", "2.7", "2.8", "2.9"],
-    }
-
-    def is_active(self):
-        """Skip hosts that do not have package requirements."""
-        group_names = self.get_var("group_names", default=[])
-        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):
-        args = {
-            "package_list": [
-                {
-                    "name": "openvswitch",
-                    "version": self.get_required_ovs_version(),
-                },
-            ],
-        }
-        return self.execute_module("rpm_version", args)
-
-    def get_required_ovs_version(self):
-        """Return the correct Open vSwitch version(s) for the current OpenShift version."""
-        return self.get_required_version("Open vSwitch", self.openshift_to_ovs_version)

roles/openshift_health_checker/openshift_checks/package_version.py

@@ -10,17 +10,6 @@ class PackageVersion(NotContainerizedMixin, OpenShiftCheck):
     name = "package_version"
     tags = ["preflight"]
 
-    # NOTE: versions outside those specified are mapped to least/greatest
-    openshift_to_ovs_version = {
-        (3, 4): "2.4",
-        (3, 5): ["2.6", "2.7"],
-        (3, 6): ["2.6", "2.7", "2.8", "2.9"],
-        (3, 7): ["2.6", "2.7", "2.8", "2.9"],
-        (3, 8): ["2.6", "2.7", "2.8", "2.9"],
-        (3, 9): ["2.6", "2.7", "2.8", "2.9"],
-        (3, 10): ["2.6", "2.7", "2.8", "2.9"],
-    }
-
     def is_active(self):
         """Skip hosts that do not have package requirements."""
         group_names = self.get_var("group_names", default=[])
@@ -39,11 +28,6 @@ class PackageVersion(NotContainerizedMixin, OpenShiftCheck):
             "package_mgr": self.get_var("ansible_pkg_mgr"),
             "package_list": [
                 {
-                    "name": "openvswitch",
-                    "version": self.get_required_ovs_version(),
-                    "check_multi": False,
-                },
-                {
                     "name": "{}".format(rpm_prefix),
                     "version": openshift_release,
                     "check_multi": check_multi_minor_release,
@@ -62,7 +46,3 @@ class PackageVersion(NotContainerizedMixin, OpenShiftCheck):
         }
 
         return self.execute_module_with_retries("aos_version", args)
-
-    def get_required_ovs_version(self):
-        """Return the correct Open vSwitch version(s) for the current OpenShift version."""
-        return self.get_required_version("Open vSwitch", self.openshift_to_ovs_version)

roles/openshift_health_checker/test/ovs_version_test.py

@@ -1,77 +0,0 @@
-import pytest
-
-from openshift_checks.ovs_version import OvsVersion
-from openshift_checks import OpenShiftCheckException
-
-
-def test_invalid_openshift_release_format():
-    def execute_module(*_):
-        return {}
-
-    task_vars = dict(
-        openshift=dict(common=dict()),
-        openshift_image_tag='v0',
-        openshift_deployment_type='origin',
-        openshift_service_type='origin'
-    )
-
-    with pytest.raises(OpenShiftCheckException) as excinfo:
-        OvsVersion(execute_module, task_vars).run()
-    assert "invalid version" in str(excinfo.value)
-
-
-@pytest.mark.parametrize('openshift_release,expected_ovs_version', [
-    ("3.7", ["2.6", "2.7", "2.8"]),
-    ("3.5", ["2.6", "2.7"]),
-    ("3.6", ["2.6", "2.7", "2.8"]),
-    ("3.4", "2.4"),
-    ("3.3", "2.4"),
-    ("1.0", "2.4"),
-])
-def test_ovs_package_version(openshift_release, expected_ovs_version):
-    task_vars = dict(
-        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
-
-    def execute_module(module_name=None, module_args=None, *_):
-        assert module_name == 'rpm_version'
-        assert "package_list" in module_args
-
-        for pkg in module_args["package_list"]:
-            if pkg["name"] == "openvswitch":
-                assert pkg["version"] == expected_ovs_version
-
-        return return_value
-
-    check = OvsVersion(execute_module, task_vars)
-    check.openshift_to_ovs_version = {
-        (3, 4): "2.4",
-        (3, 5): ["2.6", "2.7"],
-        (3, 6): ["2.6", "2.7", "2.8"],
-    }
-    result = check.run()
-    assert result is return_value
-
-
-@pytest.mark.parametrize('group_names,openshift_is_atomic,is_active', [
-    (['oo_masters_to_config'], False, True),
-    # ensure check is skipped on containerized installs
-    (['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),
-    (['oo_etcd_to_config'], False, False),
-    (['lb'], False, False),
-    (['nfs'], False, False),
-])
-def test_ovs_version_skip_when_not_master_nor_node(group_names, openshift_is_atomic, is_active):
-    task_vars = dict(
-        group_names=group_names,
-        openshift_is_atomic=openshift_is_atomic,
-    )
-    assert OvsVersion(None, task_vars).is_active() == is_active

roles/openshift_health_checker/test/package_version_test.py

@@ -1,7 +1,6 @@
 import pytest
 
 from openshift_checks.package_version import PackageVersion
-from openshift_checks import OpenShiftCheckException
 
 
 def task_vars_for(openshift_release, deployment_type):
@@ -17,29 +16,6 @@ def task_vars_for(openshift_release, deployment_type):
     )
 
 
-def test_openshift_version_not_supported():
-    check = PackageVersion(None, task_vars_for("1.2.3", 'origin'))
-    check.get_major_minor_version = lambda: (3, 4, 1)  # won't be in the dict
-
-    with pytest.raises(OpenShiftCheckException) as excinfo:
-        check.get_required_ovs_version()
-    assert "no recommended version of Open vSwitch" in str(excinfo.value)
-
-
-def test_invalid_openshift_release_format():
-    task_vars = dict(
-        ansible_pkg_mgr='yum',
-        openshift_service_type='origin',
-        openshift_image_tag='v0',
-        openshift_deployment_type='origin',
-    )
-
-    check = PackageVersion(lambda *_: {}, task_vars)
-    with pytest.raises(OpenShiftCheckException) as excinfo:
-        check.run()
-    assert "invalid version" in str(excinfo.value)
-
-
 @pytest.mark.parametrize('openshift_release', [
     "111.7.0",
     "3.7",