summaryrefslogtreecommitdiffstats
path: root/callback_plugins
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-04-24 13:32:19 -0400
committerScott Dodson <sdodson@redhat.com>2017-04-25 15:58:47 -0400
commit89568da2b83650b8e2844c45090405f47604ba36 (patch)
tree101445047c9152752dcd91fa95bb12513ffa9a77 /callback_plugins
parentb2a69e98cbf4fd91496276bd24b046bb582137ef (diff)
downloadopenshift-89568da2b83650b8e2844c45090405f47604ba36.tar.gz
openshift-89568da2b83650b8e2844c45090405f47604ba36.tar.bz2
openshift-89568da2b83650b8e2844c45090405f47604ba36.tar.xz
openshift-89568da2b83650b8e2844c45090405f47604ba36.zip
Bump ansible rpm dependency to 2.2.2.0
Remove check for unpatched 2.2.1.0
Diffstat (limited to 'callback_plugins')
-rw-r--r--callback_plugins/aa_version_requirement.py20
1 files changed, 2 insertions, 18 deletions
diff --git a/callback_plugins/aa_version_requirement.py b/callback_plugins/aa_version_requirement.py
index f31445381..20bdd9056 100644
--- a/callback_plugins/aa_version_requirement.py
+++ b/callback_plugins/aa_version_requirement.py
@@ -7,7 +7,6 @@ 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':
@@ -30,13 +29,8 @@ else:
# Set to minimum required Ansible version
-REQUIRED_VERSION = '2.2.0.0'
-DESCRIPTION = "Supported versions: %s or newer (except 2.2.1.0)" % REQUIRED_VERSION
-FAIL_ON_2_2_1_0 = "There are known issues with Ansible version 2.2.1.0 which " \
- "are impacting OpenShift-Ansible. Please use Ansible " \
- "version 2.2.0.0 or a version greater than 2.2.1.0. " \
- "See this issue for more details: " \
- "https://github.com/openshift/openshift-ansible/issues/3111"
+REQUIRED_VERSION = '2.2.2.0'
+DESCRIPTION = "Supported versions: %s or newer" % REQUIRED_VERSION
def version_requirement(version):
@@ -64,13 +58,3 @@ class CallbackModule(CallbackBase):
'FATAL: Current Ansible version (%s) is not supported. %s'
% (__version__, DESCRIPTION), color='red')
sys.exit(1)
-
- if __version__ == '2.2.1.0':
- 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)