From cf737735ffdbc2a83d03361e57538a5bff903f6f Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Mon, 4 Jul 2016 12:52:06 -0300
Subject: Fixes for Ansible 2.1.

---
 .../byo/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml      | 4 ----
 roles/openshift_version/tasks/main.yml                           | 9 ++++++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml
index 24617620b..8c89e118e 100644
--- a/playbooks/byo/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml
+++ b/playbooks/byo/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml
@@ -4,10 +4,6 @@
   become: no
   gather_facts: no
   tasks:
-  - 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')
   - include_vars: ../../../../byo/openshift-cluster/cluster_hosts.yml
   - add_host:
       name: "{{ item }}"
diff --git a/roles/openshift_version/tasks/main.yml b/roles/openshift_version/tasks/main.yml
index 8cd66cbe9..a27ddeaee 100644
--- a/roles/openshift_version/tasks/main.yml
+++ b/roles/openshift_version/tasks/main.yml
@@ -69,13 +69,16 @@
 - debug: var=openshift_pkg_version
 - debug: var=openshift_image_tag
 
-- fail: openshift_version role was unable to set openshift_version
+- fail:
+    msg: openshift_version role was unable to set openshift_version
   when: openshift_version is not defined
 
-- fail: openshift_version role was unable to set openshift_image_tag
+- fail:
+    msg: openshift_version role was unable to set openshift_image_tag
   when: openshift_image_tag is not defined
 
-- fail: openshift_version role was unable to set openshift_pkg_version
+- fail:
+    msg: openshift_version role was unable to set openshift_pkg_version
   when: openshift_pkg_version is not defined
 
 # We can't map an openshift_release to full rpm version like we can with containers, make sure
-- 
cgit v1.2.3