summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Meyer <lmeyer@redhat.com>2018-02-06 16:54:26 -0500
committerLuke Meyer <lmeyer@redhat.com>2018-02-06 16:58:16 -0500
commit43bf07fca32b6dc2bb6b30f0d0c1183d2be786ab (patch)
treee96c175dba7c68b8261c63e1ddf494f53b9b2a0c
parent02dc7d4ab672e04f7500bfb5d1dfa2401df2c6d8 (diff)
downloadopenshift-43bf07fca32b6dc2bb6b30f0d0c1183d2be786ab.tar.gz
openshift-43bf07fca32b6dc2bb6b30f0d0c1183d2be786ab.tar.bz2
openshift-43bf07fca32b6dc2bb6b30f0d0c1183d2be786ab.tar.xz
openshift-43bf07fca32b6dc2bb6b30f0d0c1183d2be786ab.zip
health checks: tolerate ovs 2.9
-rw-r--r--roles/openshift_health_checker/openshift_checks/ovs_version.py9
-rw-r--r--roles/openshift_health_checker/openshift_checks/package_version.py9
-rw-r--r--roles/openshift_health_checker/test/ovs_version_test.py8
3 files changed, 17 insertions, 9 deletions
diff --git a/roles/openshift_health_checker/openshift_checks/ovs_version.py b/roles/openshift_health_checker/openshift_checks/ovs_version.py
index 58a2692bd..4352778c2 100644
--- a/roles/openshift_health_checker/openshift_checks/ovs_version.py
+++ b/roles/openshift_health_checker/openshift_checks/ovs_version.py
@@ -18,10 +18,11 @@ class OvsVersion(NotContainerizedMixin, OpenShiftCheck):
openshift_to_ovs_version = {
(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"],
+ (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.8", "2.9"],
}
def is_active(self):
diff --git a/roles/openshift_health_checker/openshift_checks/package_version.py b/roles/openshift_health_checker/openshift_checks/package_version.py
index 28aee8b35..3e8c1dac3 100644
--- a/roles/openshift_health_checker/openshift_checks/package_version.py
+++ b/roles/openshift_health_checker/openshift_checks/package_version.py
@@ -14,10 +14,11 @@ class PackageVersion(NotContainerizedMixin, OpenShiftCheck):
openshift_to_ovs_version = {
(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"],
+ (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.8", "2.9"],
}
openshift_to_docker_version = {
diff --git a/roles/openshift_health_checker/test/ovs_version_test.py b/roles/openshift_health_checker/test/ovs_version_test.py
index 80c7a0541..14fc6a4ec 100644
--- a/roles/openshift_health_checker/test/ovs_version_test.py
+++ b/roles/openshift_health_checker/test/ovs_version_test.py
@@ -47,7 +47,13 @@ def test_ovs_package_version(openshift_release, expected_ovs_version):
return return_value
- result = OvsVersion(execute_module, task_vars).run()
+ 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