summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-02-02 15:59:24 -0500
committerRussell Teague <rteague@redhat.com>2017-02-02 15:59:24 -0500
commit404da9436efc69a615b29cded6230db29cb4e659 (patch)
treee02bb9ad03cff54251b5d6fd1c200a711a460c2f
parent4dfe8c715bfc49a913d7c7bea80c475a9b50b41e (diff)
downloadopenshift-404da9436efc69a615b29cded6230db29cb4e659.tar.gz
openshift-404da9436efc69a615b29cded6230db29cb4e659.tar.bz2
openshift-404da9436efc69a615b29cded6230db29cb4e659.tar.xz
openshift-404da9436efc69a615b29cded6230db29cb4e659.zip
Add logic to verify patched version of Ansible
A patched version of Ansible is being made available, which should not cause a failure on version checking.
-rw-r--r--callback_plugins/aa_version_requirement.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/callback_plugins/aa_version_requirement.py b/callback_plugins/aa_version_requirement.py
index 40affb18b..f31445381 100644
--- a/callback_plugins/aa_version_requirement.py
+++ b/callback_plugins/aa_version_requirement.py
@@ -7,6 +7,7 @@ The plugin is named with leading `aa_` to ensure this plugin is loaded
first (alphanumerically) by Ansible.
"""
import sys
+from subprocess import check_output
from ansible import __version__
if __version__ < '2.0':
@@ -65,7 +66,11 @@ class CallbackModule(CallbackBase):
sys.exit(1)
if __version__ == '2.2.1.0':
- display(
- 'FATAL: Current Ansible version (%s) is not supported. %s'
- % (__version__, FAIL_ON_2_2_1_0), color='red')
- sys.exit(1)
+ rpm_ver = str(check_output(["rpm", "-qa", "ansible"]))
+ patched_ansible = '2.2.1.0-2'
+
+ if patched_ansible not in rpm_ver:
+ display(
+ 'FATAL: Current Ansible version (%s) is not supported. %s'
+ % (__version__, FAIL_ON_2_2_1_0), color='red')
+ sys.exit(1)