diff options
| author | Luke Meyer <lmeyer@redhat.com> | 2017-03-06 16:27:39 -0500 |
|---|---|---|
| committer | Luke Meyer <lmeyer@redhat.com> | 2017-04-08 17:59:17 -0400 |
| commit | 96a6efb7e92afc0ad9f8899bbc2cefbc169c7ede (patch) | |
| tree | 60a7ba8a9e1b2a13b131a8a83f37932f37bc8938 /roles/openshift_health_checker/openshift_checks/package_version.py | |
| parent | 94d3945e9734c9848d6c8bab907fa08c80aa917b (diff) | |
| download | openshift-96a6efb7e92afc0ad9f8899bbc2cefbc169c7ede.tar.gz openshift-96a6efb7e92afc0ad9f8899bbc2cefbc169c7ede.tar.bz2 openshift-96a6efb7e92afc0ad9f8899bbc2cefbc169c7ede.tar.xz openshift-96a6efb7e92afc0ad9f8899bbc2cefbc169c7ede.zip | |
preflight checks: refactor and fix aos_version
Bring in openshift_repos to provide Origin repo before checks on Origin.
For OCP we want the check to fail if both version 3.3 and version 3.4
are available - they shouldn't have both channels enabled.
For Origin everything is in one repo so it's not surprising to find 1.4
and 1.5 versions available.
Added unit tests as well.
Diffstat (limited to 'roles/openshift_health_checker/openshift_checks/package_version.py')
| -rw-r--r-- | roles/openshift_health_checker/openshift_checks/package_version.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/roles/openshift_health_checker/openshift_checks/package_version.py b/roles/openshift_health_checker/openshift_checks/package_version.py index 42193a1c6..cca2d8b75 100644 --- a/roles/openshift_health_checker/openshift_checks/package_version.py +++ b/roles/openshift_health_checker/openshift_checks/package_version.py @@ -10,11 +10,9 @@ class PackageVersion(NotContainerizedMixin, OpenShiftCheck): tags = ["preflight"] def run(self, tmp, task_vars): - rpm_prefix = get_var(task_vars, "openshift", "common", "service_type") - openshift_release = get_var(task_vars, "openshift_release") - args = { - "prefix": rpm_prefix, - "version": openshift_release, + "requested_openshift_release": get_var(task_vars, "openshift_release", default=''), + "openshift_deployment_type": get_var(task_vars, "openshift_deployment_type"), + "rpm_prefix": get_var(task_vars, "openshift", "common", "service_type"), } return self.execute_module("aos_version", args, tmp, task_vars) |