diff options
author | Luke Meyer <lmeyer@redhat.com> | 2017-06-08 16:09:05 -0400 |
---|---|---|
committer | Luke Meyer <lmeyer@redhat.com> | 2017-06-14 07:02:19 -0400 |
commit | f19d2747ed9cc40f6eb68f2383f44f268c5a431a (patch) | |
tree | ad6272733263ad22f8cb9387d08d946a96db2d6e /roles/openshift_health_checker/openshift_checks/mixins.py | |
parent | 705d18190fe463c9f609f95882f16b95d3f7cca2 (diff) | |
download | openshift-f19d2747ed9cc40f6eb68f2383f44f268c5a431a.tar.gz openshift-f19d2747ed9cc40f6eb68f2383f44f268c5a431a.tar.bz2 openshift-f19d2747ed9cc40f6eb68f2383f44f268c5a431a.tar.xz openshift-f19d2747ed9cc40f6eb68f2383f44f268c5a431a.zip |
pre-install checks: add more during byo install
Add the docker and RPM checks to the list that run at install time.
They can be disabled the same as the existing ones.
Removed cockpit-kubernetes RPM requirement as it no longer is.
Fixed up docker_image_availability to handle oreg_url and other nuances.
Switched to using the openshift_image_tag that's set by openshift_version for
both component and infrastructure images.
Fixed a bug where execute_module was being called with incorrect
positional arg "tmp" as a dict which caused errors down the call stack.
Diffstat (limited to 'roles/openshift_health_checker/openshift_checks/mixins.py')
-rw-r--r-- | roles/openshift_health_checker/openshift_checks/mixins.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/roles/openshift_health_checker/openshift_checks/mixins.py b/roles/openshift_health_checker/openshift_checks/mixins.py index 7f3d78cc4..2cb2e21aa 100644 --- a/roles/openshift_health_checker/openshift_checks/mixins.py +++ b/roles/openshift_health_checker/openshift_checks/mixins.py @@ -40,8 +40,11 @@ class DockerHostMixin(object): # NOTE: we would use the "package" module but it's actually an action plugin # and it's not clear how to invoke one of those. This is about the same anyway: - pkg_manager = get_var(task_vars, "ansible_pkg_mgr", default="yum") - result = self.module_executor(pkg_manager, {"name": self.dependencies, "state": "present"}, task_vars) + result = self.execute_module( + get_var(task_vars, "ansible_pkg_mgr", default="yum"), + {"name": self.dependencies, "state": "present"}, + task_vars=task_vars, + ) msg = result.get("msg", "") if result.get("failed"): if "No package matching" in msg: |