summaryrefslogtreecommitdiffstats
path: root/roles/openshift_health_checker/test
diff options
context:
space:
mode:
authorLuke Meyer <lmeyer@redhat.com>2017-09-05 15:57:46 -0400
committerLuke Meyer <lmeyer@redhat.com>2017-09-06 09:03:59 -0400
commit8e514993f5fbe14050e702b2bf7494466cdafcf9 (patch)
tree2f04faf35b42fbe832c737cea2708c2fb5be7353 /roles/openshift_health_checker/test
parentbc79e5c3093c23ba16f79421ff53ed0c7a22a14a (diff)
downloadopenshift-8e514993f5fbe14050e702b2bf7494466cdafcf9.tar.gz
openshift-8e514993f5fbe14050e702b2bf7494466cdafcf9.tar.bz2
openshift-8e514993f5fbe14050e702b2bf7494466cdafcf9.tar.xz
openshift-8e514993f5fbe14050e702b2bf7494466cdafcf9.zip
openshift_checks aos_version: also check installed under yum
Tweaks to the logic around using yum vs dnf; now uses ansible_pkg_mgr to determine which is in effect for a host. Also, extended the yum logic to check installed packages in addition to available packages in the aos_version module so that disconnected installs and others with weird repo configs need not disable the package_version check.
Diffstat (limited to 'roles/openshift_health_checker/test')
-rw-r--r--roles/openshift_health_checker/test/package_version_test.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_health_checker/test/package_version_test.py b/roles/openshift_health_checker/test/package_version_test.py
index 6054d3f3e..e871f39f0 100644
--- a/roles/openshift_health_checker/test/package_version_test.py
+++ b/roles/openshift_health_checker/test/package_version_test.py
@@ -5,6 +5,7 @@ from openshift_checks.package_version import PackageVersion, OpenShiftCheckExcep
def task_vars_for(openshift_release, deployment_type):
return dict(
+ ansible_pkg_mgr='yum',
openshift=dict(common=dict(service_type=deployment_type)),
openshift_release=openshift_release,
openshift_image_tag='v' + openshift_release,
@@ -27,6 +28,7 @@ def test_openshift_version_not_supported():
def test_invalid_openshift_release_format():
task_vars = dict(
+ ansible_pkg_mgr='yum',
openshift=dict(common=dict(service_type='origin')),
openshift_image_tag='v0',
openshift_deployment_type='origin',