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 }}"
---
 playbooks/adhoc/create_pv/create_pv.yaml                          | 2 +-
 .../docker_loopback_to_lvm/docker_loopback_to_direct_lvm.yml      | 2 +-
 .../docker_loopback_to_lvm/ops-docker-loopback-to-direct-lvm.yml  | 2 +-
 playbooks/adhoc/docker_storage_cleanup/docker_storage_cleanup.yml | 2 +-
 playbooks/adhoc/grow_docker_vg/grow_docker_vg.yml                 | 2 +-
 playbooks/adhoc/uninstall.yml                                     | 8 ++++----
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'playbooks/adhoc')

diff --git a/playbooks/adhoc/create_pv/create_pv.yaml b/playbooks/adhoc/create_pv/create_pv.yaml
index 81c1ee653..16bfd85e8 100644
--- a/playbooks/adhoc/create_pv/create_pv.yaml
+++ b/playbooks/adhoc/create_pv/create_pv.yaml
@@ -20,7 +20,7 @@
   pre_tasks:
   - fail:
       msg: "This playbook requires {{item}} to be set."
-    when: "{{ item }} is not defined or {{ item }} == ''"
+    when: "item is not defined or item == ''"
     with_items:
     - cli_volume_size
     - cli_device_name
diff --git a/playbooks/adhoc/docker_loopback_to_lvm/docker_loopback_to_direct_lvm.yml b/playbooks/adhoc/docker_loopback_to_lvm/docker_loopback_to_direct_lvm.yml
index f638fab83..5f0ec949c 100644
--- a/playbooks/adhoc/docker_loopback_to_lvm/docker_loopback_to_direct_lvm.yml
+++ b/playbooks/adhoc/docker_loopback_to_lvm/docker_loopback_to_direct_lvm.yml
@@ -33,7 +33,7 @@
   pre_tasks:
   - fail:
       msg: "This playbook requires {{item}} to be set."
-    when: "{{ item }} is not defined or {{ item }} == ''"
+    when: "item is not defined or item == ''"
     with_items:
     - cli_tag_name
     - cli_volume_size
diff --git a/playbooks/adhoc/docker_loopback_to_lvm/ops-docker-loopback-to-direct-lvm.yml b/playbooks/adhoc/docker_loopback_to_lvm/ops-docker-loopback-to-direct-lvm.yml
index d988a28b0..2774afb27 100755
--- a/playbooks/adhoc/docker_loopback_to_lvm/ops-docker-loopback-to-direct-lvm.yml
+++ b/playbooks/adhoc/docker_loopback_to_lvm/ops-docker-loopback-to-direct-lvm.yml
@@ -24,7 +24,7 @@
   pre_tasks:
   - fail:
       msg: "This playbook requires {{item}} to be set."
-    when: "{{ item }} is not defined or {{ item }} == ''"
+    when: "item is not defined or item == ''"
     with_items:
     - cli_docker_device
 
diff --git a/playbooks/adhoc/docker_storage_cleanup/docker_storage_cleanup.yml b/playbooks/adhoc/docker_storage_cleanup/docker_storage_cleanup.yml
index b6dde357e..9f1f9189a 100644
--- a/playbooks/adhoc/docker_storage_cleanup/docker_storage_cleanup.yml
+++ b/playbooks/adhoc/docker_storage_cleanup/docker_storage_cleanup.yml
@@ -25,7 +25,7 @@
 
   - fail:
       msg: "This playbook requires {{item}} to be set."
-    when: "{{ item }} is not defined or {{ item }} == ''"
+    when: "item is not defined or item == ''"
     with_items:
     - cli_tag_name
 
diff --git a/playbooks/adhoc/grow_docker_vg/grow_docker_vg.yml b/playbooks/adhoc/grow_docker_vg/grow_docker_vg.yml
index 598f1966d..0c7cc6d37 100644
--- a/playbooks/adhoc/grow_docker_vg/grow_docker_vg.yml
+++ b/playbooks/adhoc/grow_docker_vg/grow_docker_vg.yml
@@ -42,7 +42,7 @@
   pre_tasks:
   - fail:
       msg: "This playbook requires {{item}} to be set."
-    when: "{{ item }} is not defined or {{ item }} == ''"
+    when: "item is not defined or item == ''"
     with_items:
     - cli_tag_name
     - cli_volume_size
diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml
index ffdcd0ce1..8f0341759 100644
--- a/playbooks/adhoc/uninstall.yml
+++ b/playbooks/adhoc/uninstall.yml
@@ -125,7 +125,7 @@
       - name: Remove flannel package
         package: name=flannel state=absent
         when: openshift_use_flannel | default(false) | bool
-      when: "{{ not is_atomic | bool }}"
+      when: "not is_atomic | bool"
 
     - shell: systemctl reset-failed
       changed_when: False
@@ -146,7 +146,7 @@
       - lbr0
       - vlinuxbr
       - vovsbr
-    when: "{{ openshift_remove_all | default(true) | bool }}"
+    when: "openshift_remove_all | default(true) | bool"
 
   - shell: atomic uninstall "{{ item }}"-master-api
     changed_when: False
@@ -239,7 +239,7 @@
         changed_when: False
         failed_when: False
         with_items: "{{ images_to_delete.results }}"
-      when: "{{ openshift_uninstall_images | default(True) | bool }}"
+      when: "openshift_uninstall_images | default(True) | bool"
 
     - name: remove sdn drop files
       file:
@@ -252,7 +252,7 @@
       - /etc/sysconfig/openshift-node
       - /etc/sysconfig/openvswitch
       - /run/openshift-sdn
-    when: "{{ openshift_remove_all | default(True) | bool }}"
+    when: "openshift_remove_all | default(True) | bool"
 
   - find: path={{ item }} file_type=file
     register: files
-- 
cgit v1.2.1