Skip to content

Commit

Permalink
Bump ansible rpm dependency to 2.2.2.0
Browse files Browse the repository at this point in the history
Remove check for unpatched 2.2.1.0
  • Loading branch information
sdodson committed Apr 25, 2017
1 parent b2a69e9 commit 89568da
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 20 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 2 additions & 18 deletions callback_plugins/aa_version_requirement.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
first (alphanumerically) by Ansible.
"""
import sys
from subprocess import check_output
from ansible import __version__

if __version__ < '2.0':
Expand All @@ -30,13 +29,8 @@ def display(*args, **kwargs):


# 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):
Expand Down Expand Up @@ -64,13 +58,3 @@ def __init__(self):
'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)
2 changes: 1 addition & 1 deletion openshift-ansible.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 89568da

Please sign in to comment.