Merge pull request #1253 from detiber/updateMinVersion

Update Docs and test for testing ansible version

README.md

@@ -6,11 +6,11 @@ This repo contains Ansible code for OpenShift and Atomic Enterprise.
 - Install base dependencies:
   - Fedora:
   ```
-    dnf install -y ansible rubygem-thor rubygem-parseconfig util-linux pyOpenSSL libffi-devel python-cryptography
+    dnf install -y ansible-1.9.4 rubygem-thor rubygem-parseconfig util-linux pyOpenSSL libffi-devel python-cryptography
   ```
    - OSX:
   ```
-    # Install ansible and python 2
+    # Install ansible 1.9.4 and python 2
     brew install ansible python
     # Required ruby gems
     gem install thor parseconfig

README_AEP.md

@@ -10,9 +10,7 @@
 * [Overriding detected ip addresses and hostnames](#overriding-detected-ip-addresses-and-hostnames)
 
 ## Requirements
-* ansible
-  * Tested using ansible 1.9.1 and 1.9.2
-  * There is currently a known issue with ansible-1.9.0, you can downgrade to 1.8.4 on Fedora by installing one of the builds from Koji: http://koji.fedoraproject.org/koji/packageinfo?packageID=13842
+* ansible 1.9.4
   * Available in Fedora channels
   * Available for EL with EPEL and Optional channel
 * One or more RHEL 7.1 VMs

README_OSE.md

@@ -10,9 +10,7 @@
 * [Overriding detected ip addresses and hostnames](#overriding-detected-ip-addresses-and-hostnames)
 
 ## Requirements
-* ansible
-  * Tested using ansible-1.8.4-1.fc20.noarch, but should work with version 1.8+
-  * There is currently a known issue with ansible-1.9.0, you can downgrade to 1.8.4 on Fedora by installing one of the builds from Koji: http://koji.fedoraproject.org/koji/packageinfo?packageID=13842
+* ansible 1.9.4
   * Available in Fedora channels
   * Available for EL with EPEL and Optional channel
 * One or more RHEL 7.1 VMs

README_origin.md

@@ -10,9 +10,7 @@
 * [Overriding detected ip addresses and hostnames](#overriding-detected-ip-addresses-and-hostnames)
 
 ## Requirements
-* ansible
-  * Tested using ansible-1.8.4-1.fc20.noarch, but should work with version 1.8+
-  * There is currently a known issue with ansible-1.9.0, you can downgrade to 1.8.4 on Fedora by installing one of the builds from Koji: http://koji.fedoraproject.org/koji/packageinfo?packageID=13842
+* ansible 1.9.4
   * Available in Fedora channels
   * Available for EL with EPEL and Optional channel
 * One or more RHEL 7.1+, CentOS 7.1+, or Fedora 23+ VMs

roles/openshift_facts/tasks/main.yml

@@ -1,11 +1,9 @@
 ---
-- name: Verify Ansible version is greater than 1.8.0 and not 1.9.0 and not 1.9.0.1
-  assert:
-    that:
-    - ansible_version | version_compare('1.8.0', 'ge')
-    - ansible_version | version_compare('1.9.0', 'ne')
-    - ansible_version | version_compare('1.9.0.1', 'ne')
-    
+- name: Verify Ansible version is greater than or equal to 1.9.4 and less than 2.0
+  fail:
+    msg: "Unsupported ansible version: {{ ansible_version }} found"
+  when: ansible_version.full | version_compare('1.9.4', 'lt') or ansible_version.full | version_compare('2.0', 'ge')
+
 - name: Detecting Operating System
   shell: ls /run/ostree-booted
   ignore_errors: yes