summaryrefslogtreecommitdiffstats
path: root/roles/openshift_health_checker/openshift_checks
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-04-11 12:57:13 -0500
committerGitHub <noreply@github.com>2017-04-11 12:57:13 -0500
commitf11303975bc87febdf7ba992c2c0971e40890dce (patch)
treea189e2ce688836e714cb66d46303489765c56c1c /roles/openshift_health_checker/openshift_checks
parent262972880b69df0dacbb95cf71a351bd5033d665 (diff)
parent96a6efb7e92afc0ad9f8899bbc2cefbc169c7ede (diff)
downloadopenshift-f11303975bc87febdf7ba992c2c0971e40890dce.tar.gz
openshift-f11303975bc87febdf7ba992c2c0971e40890dce.tar.bz2
openshift-f11303975bc87febdf7ba992c2c0971e40890dce.tar.xz
openshift-f11303975bc87febdf7ba992c2c0971e40890dce.zip
Merge pull request #3649 from sosiouxme/20170313-fix-output-and-exclusions
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_health_checker/openshift_checks')
-rw-r--r--roles/openshift_health_checker/openshift_checks/package_version.py8
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)