From b6190a17b578de72147e481b0eea00aca59adc2f Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Fri, 21 Apr 2017 13:30:53 -0400
Subject: Remove jinja template delimeters from when conditions

In ansible 2.3 "[WARNING]: when statements should not include jinja2
templating delimiters such as {{ }} or {% %}. Found: {{
g_glusterfs_hosts is not defined }}"
---
 roles/lib_openshift/src/test/integration/oc_label.yml | 2 +-
 roles/lib_openshift/src/test/integration/oc_user.yml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'roles/lib_openshift')

diff --git a/roles/lib_openshift/src/test/integration/oc_label.yml b/roles/lib_openshift/src/test/integration/oc_label.yml
index b4e721407..a265c650a 100755
--- a/roles/lib_openshift/src/test/integration/oc_label.yml
+++ b/roles/lib_openshift/src/test/integration/oc_label.yml
@@ -15,7 +15,7 @@
   - name: ensure needed vars are defined
     fail:
       msg: "{{ item }} not defined"
-    when: "{{ item }} is not defined"
+    when: "item is not defined"
     with_items:
     - cli_master_test  # ansible inventory instance to run playbook against
 
diff --git a/roles/lib_openshift/src/test/integration/oc_user.yml b/roles/lib_openshift/src/test/integration/oc_user.yml
index ad1f9d188..28a13e3f7 100755
--- a/roles/lib_openshift/src/test/integration/oc_user.yml
+++ b/roles/lib_openshift/src/test/integration/oc_user.yml
@@ -14,7 +14,7 @@
   - name: ensure needed vars are defined
     fail:
       msg: "{{ item }} no defined"
-    when: "{{ item}} is not defined"
+    when: "item is not defined"
     with_items:
     - cli_master_test  # ansible inventory instance to run playbook against
 
-- 
cgit v1.2.3


From 717c36fde2639f6f3cc7bf534052e1df0479c2fe Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Thu, 27 Apr 2017 09:31:41 -0400
Subject: Don't double quote when conditions

---
 roles/lib_openshift/src/test/integration/oc_label.yml | 2 +-
 roles/lib_openshift/src/test/integration/oc_user.yml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'roles/lib_openshift')

diff --git a/roles/lib_openshift/src/test/integration/oc_label.yml b/roles/lib_openshift/src/test/integration/oc_label.yml
index a265c650a..22cf687c5 100755
--- a/roles/lib_openshift/src/test/integration/oc_label.yml
+++ b/roles/lib_openshift/src/test/integration/oc_label.yml
@@ -15,7 +15,7 @@
   - name: ensure needed vars are defined
     fail:
       msg: "{{ item }} not defined"
-    when: "item is not defined"
+    when: item is not defined
     with_items:
     - cli_master_test  # ansible inventory instance to run playbook against
 
diff --git a/roles/lib_openshift/src/test/integration/oc_user.yml b/roles/lib_openshift/src/test/integration/oc_user.yml
index 28a13e3f7..9b4290052 100755
--- a/roles/lib_openshift/src/test/integration/oc_user.yml
+++ b/roles/lib_openshift/src/test/integration/oc_user.yml
@@ -14,7 +14,7 @@
   - name: ensure needed vars are defined
     fail:
       msg: "{{ item }} no defined"
-    when: "item is not defined"
+    when: item is not defined
     with_items:
     - cli_master_test  # ansible inventory instance to run playbook against
 
-- 
cgit v1.2.3