diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-08-17 02:23:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-17 02:23:06 -0400 |
| commit | 2d5d64940fbd398d7818014b3c8116765503a4f1 (patch) | |
| tree | 9915b8e64f78d683d4ffb0437fcfde04c659543c /roles | |
| parent | 22fc8d8c9df7e5d72b9f60218022ca059db309be (diff) | |
| parent | 0094265fbf7bf7cdde851629fd22216ae48e1082 (diff) | |
| download | openshift-2d5d64940fbd398d7818014b3c8116765503a4f1.tar.gz openshift-2d5d64940fbd398d7818014b3c8116765503a4f1.tar.bz2 openshift-2d5d64940fbd398d7818014b3c8116765503a4f1.tar.xz openshift-2d5d64940fbd398d7818014b3c8116765503a4f1.zip | |
Merge pull request #5026 from sosiouxme/20170808-fix-checks
Merged by openshift-bot
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_health_checker/openshift_checks/etcd_traffic.py | 4 | ||||
| -rw-r--r-- | roles/openshift_health_checker/test/etcd_traffic_test.py | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/roles/openshift_health_checker/openshift_checks/etcd_traffic.py b/roles/openshift_health_checker/openshift_checks/etcd_traffic.py index cc1b14d8a..b4c8957e9 100644 --- a/roles/openshift_health_checker/openshift_checks/etcd_traffic.py +++ b/roles/openshift_health_checker/openshift_checks/etcd_traffic.py @@ -14,8 +14,8 @@ class EtcdTraffic(OpenShiftCheck): group_names = self.get_var("group_names", default=[]) valid_group_names = "etcd" in group_names - version = self.get_var("openshift", "common", "short_version") - valid_version = version in ("3.4", "3.5", "1.4", "1.5") + version = self.get_major_minor_version(self.get_var("openshift_image_tag")) + valid_version = version in ((3, 4), (3, 5)) return super(EtcdTraffic, self).is_active() and valid_group_names and valid_version diff --git a/roles/openshift_health_checker/test/etcd_traffic_test.py b/roles/openshift_health_checker/test/etcd_traffic_test.py index f4316c423..fae3e578d 100644 --- a/roles/openshift_health_checker/test/etcd_traffic_test.py +++ b/roles/openshift_health_checker/test/etcd_traffic_test.py @@ -8,7 +8,7 @@ from openshift_checks.etcd_traffic import EtcdTraffic (['masters'], "3.6", False), (['nodes'], "3.4", False), (['etcd'], "3.4", True), - (['etcd'], "3.5", True), + (['etcd'], "1.5", True), (['etcd'], "3.1", False), (['masters', 'nodes'], "3.5", False), (['masters', 'etcd'], "3.5", True), @@ -17,9 +17,7 @@ from openshift_checks.etcd_traffic import EtcdTraffic def test_is_active(group_names, version, is_active): task_vars = dict( group_names=group_names, - openshift=dict( - common=dict(short_version=version), - ), + openshift_image_tag=version, ) assert EtcdTraffic(task_vars=task_vars).is_active() == is_active |