diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-01 15:23:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-01 15:23:13 -0500 |
| commit | 2852eeccb0fdad4be7ed191612833f23c8411295 (patch) | |
| tree | 7e7cb1b2517fbd965b3c26fccc724a368dffcc94 | |
| parent | 6ef6d1d85716ae8e3e850af0fc5b516e05179411 (diff) | |
| parent | 89568da2b83650b8e2844c45090405f47604ba36 (diff) | |
| download | openshift-2852eeccb0fdad4be7ed191612833f23c8411295.tar.gz openshift-2852eeccb0fdad4be7ed191612833f23c8411295.tar.bz2 openshift-2852eeccb0fdad4be7ed191612833f23c8411295.tar.xz openshift-2852eeccb0fdad4be7ed191612833f23c8411295.zip | |
Merge pull request #3986 from sdodson/require-2-2-2-0
Merged by openshift-bot
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | callback_plugins/aa_version_requirement.py | 20 | ||||
| -rw-r--r-- | openshift-ansible.spec | 2 |
3 files changed, 4 insertions, 20 deletions
@@ -54,7 +54,7 @@ you are not running a stable release. *** Requirements: - - Ansible >= 2.2.0 + - Ansible >= 2.2.2.0 - Jinja >= 2.7 - pyOpenSSL - python-lxml 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) diff --git a/openshift-ansible.spec b/openshift-ansible.spec index 00fdc3caa..d2e384c20 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -17,7 +17,7 @@ URL: https://github.com/openshift/openshift-ansible Source0: https://github.com/openshift/openshift-ansible/archive/%{commit}/%{name}-%{version}.tar.gz BuildArch: noarch -Requires: ansible >= 2.2.0.0-1 +Requires: ansible >= 2.2.2.0 Requires: python2 Requires: python-six Requires: tar |