diff options
author | Luke Meyer <sosiouxme@gmail.com> | 2018-01-18 12:08:44 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-18 12:08:44 -0500 |
commit | 13cdf9cbd05fde7632cb06e4cc843648717f8c38 (patch) | |
tree | 783e662ec19f3fe011de3465dde3ef3df2c98639 /roles/openshift_health_checker/openshift_checks/ovs_version.py | |
parent | 44f9ab2767cd7390c53b5a4bc0bf424094ae5956 (diff) | |
parent | c23910bdcb07a8644f586907fac1df6101dd7eff (diff) | |
download | openshift-13cdf9cbd05fde7632cb06e4cc843648717f8c38.tar.gz openshift-13cdf9cbd05fde7632cb06e4cc843648717f8c38.tar.bz2 openshift-13cdf9cbd05fde7632cb06e4cc843648717f8c38.tar.xz openshift-13cdf9cbd05fde7632cb06e4cc843648717f8c38.zip |
Merge pull request #6757 from sosiouxme/20180117-update-check-versions
update health check required versions for 3.9
Diffstat (limited to 'roles/openshift_health_checker/openshift_checks/ovs_version.py')
-rw-r--r-- | roles/openshift_health_checker/openshift_checks/ovs_version.py | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/roles/openshift_health_checker/openshift_checks/ovs_version.py b/roles/openshift_health_checker/openshift_checks/ovs_version.py index 0cad19842..58a2692bd 100644 --- a/roles/openshift_health_checker/openshift_checks/ovs_version.py +++ b/roles/openshift_health_checker/openshift_checks/ovs_version.py @@ -3,7 +3,7 @@ Ansible module for determining if an installed version of Open vSwitch is incomp currently installed version of OpenShift. """ -from openshift_checks import OpenShiftCheck, OpenShiftCheckException +from openshift_checks import OpenShiftCheck from openshift_checks.mixins import NotContainerizedMixin @@ -16,10 +16,12 @@ class OvsVersion(NotContainerizedMixin, OpenShiftCheck): tags = ["health"] openshift_to_ovs_version = { - "3.7": ["2.6", "2.7", "2.8"], - "3.6": ["2.6", "2.7", "2.8"], - "3.5": ["2.6", "2.7"], - "3.4": "2.4", + (3, 4): "2.4", + (3, 5): ["2.6", "2.7"], + (3, 6): ["2.6", "2.7", "2.8"], + (3, 7): ["2.6", "2.7", "2.8"], + (3, 8): ["2.6", "2.7", "2.8"], + (3, 9): ["2.6", "2.7", "2.8"], } def is_active(self): @@ -40,16 +42,5 @@ class OvsVersion(NotContainerizedMixin, OpenShiftCheck): return self.execute_module("rpm_version", args) def get_required_ovs_version(self): - """Return the correct Open vSwitch version for the current OpenShift version""" - openshift_version_tuple = self.get_major_minor_version(self.get_var("openshift_image_tag")) - - if openshift_version_tuple < (3, 5): - return self.openshift_to_ovs_version["3.4"] - - openshift_version = ".".join(str(x) for x in openshift_version_tuple) - ovs_version = self.openshift_to_ovs_version.get(openshift_version) - if ovs_version: - return self.openshift_to_ovs_version[openshift_version] - - msg = "There is no recommended version of Open vSwitch for the current version of OpenShift: {}" - raise OpenShiftCheckException(msg.format(openshift_version)) + """Return the correct Open vSwitch version(s) for the current OpenShift version.""" + return self.get_required_version("Open vSwitch", self.openshift_to_ovs_version) |