summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-07-18 14:10:59 -0400
committerGitHub <noreply@github.com>2016-07-18 14:10:59 -0400
commit46ff071b63bc917a00922b4f93b149d9b334f92c (patch)
treed1528d019e5a1d9f661c89691533dd0d8877f1f0
parent08791978fdf3ee385760761d4fc6bc47febf1732 (diff)
parent856e47e3a0dc21d680c0e6289c2c16575fd64bee (diff)
downloadopenshift-46ff071b63bc917a00922b4f93b149d9b334f92c.tar.gz
openshift-46ff071b63bc917a00922b4f93b149d9b334f92c.tar.bz2
openshift-46ff071b63bc917a00922b4f93b149d9b334f92c.tar.xz
openshift-46ff071b63bc917a00922b4f93b149d9b334f92c.zip
Merge pull request #1992 from abutcher/ansible-2
Require ansible-2.1.0.0+
-rw-r--r--README.md4
-rw-r--r--README_AEP.md2
-rw-r--r--openshift-ansible.spec2
-rw-r--r--roles/openshift_facts/tasks/main.yml6
4 files changed, 7 insertions, 7 deletions
diff --git a/README.md b/README.md
index 6d38c9945..4fa0286a8 100644
--- a/README.md
+++ b/README.md
@@ -11,11 +11,11 @@ they may in the future.
- Install base dependencies:
- Fedora:
```
- dnf install -y ansible-1.9.4 pyOpenSSL python-cryptography
+ dnf install -y ansible-2.1.0.0 pyOpenSSL python-cryptography
```
- OSX:
```
- # Install ansible 1.9.4 and python 2
+ # Install ansible 2.1.0.0 and python 2
brew install ansible python
```
- Setup for a specific cloud:
diff --git a/README_AEP.md b/README_AEP.md
index 1b926f2ab..c588ebbd3 100644
--- a/README_AEP.md
+++ b/README_AEP.md
@@ -10,7 +10,7 @@
* [Overriding detected ip addresses and hostnames](#overriding-detected-ip-addresses-and-hostnames)
## Requirements
-* ansible 1.9.4
+* ansible 2.1.0.0
* Available in Fedora channels
* Available for EL with EPEL and Optional channel
* One or more RHEL 7.1 VMs
diff --git a/openshift-ansible.spec b/openshift-ansible.spec
index 822070e43..f70193367 100644
--- a/openshift-ansible.spec
+++ b/openshift-ansible.spec
@@ -13,7 +13,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 >= 1.9.4
+Requires: ansible >= 2.1.0.0
Requires: python2
Requires: openshift-ansible-docs = %{version}-%{release}
diff --git a/roles/openshift_facts/tasks/main.yml b/roles/openshift_facts/tasks/main.yml
index c3723672d..2aca35ce1 100644
--- a/roles/openshift_facts/tasks/main.yml
+++ b/roles/openshift_facts/tasks/main.yml
@@ -1,8 +1,8 @@
---
-- name: Verify Ansible version is greater than or equal to 1.9.4
+- name: Verify Ansible version is greater than or equal to 2.1.0.0
fail:
- msg: "Unsupported ansible version: {{ ansible_version }} found"
- when: not ansible_version.full | version_compare('1.9.4', 'ge')
+ msg: "Unsupported ansible version: {{ ansible_version.full }} found"
+ when: not ansible_version.full | version_compare('2.1.0.0', 'ge')
- name: Detecting Operating System
stat: