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 }}"

10 files changed, 29 insertions, 29 deletions

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
diff --git a/playbooks/common/openshift-cluster/evaluate_groups.yml b/playbooks/common/openshift-cluster/evaluate_groups.yml
index 6aac70f63..2fd2fb36e 100644
--- a/playbooks/common/openshift-cluster/evaluate_groups.yml
+++ b/playbooks/common/openshift-cluster/evaluate_groups.yml
@@ -7,31 +7,31 @@
   tasks:
   - fail:
       msg: This playbook requires g_etcd_hosts to be set
-    when: "{{ g_etcd_hosts is not defined }}"
+    when: "g_etcd_hosts is not defined"
 
   - fail:
       msg: This playbook requires g_master_hosts or g_new_master_hosts to be set
-    when: "{{ g_master_hosts is not defined and g_new_master_hosts is not defined }}"
+    when: "g_master_hosts is not defined and g_new_master_hosts is not defined"
 
   - fail:
       msg: This playbook requires g_node_hosts or g_new_node_hosts to be set
-    when: "{{ g_node_hosts is not defined and g_new_node_hosts is not defined }}"
+    when: "g_node_hosts is not defined and g_new_node_hosts is not defined"
 
   - fail:
       msg: This playbook requires g_lb_hosts to be set
-    when: "{{ g_lb_hosts is not defined }}"
+    when: "g_lb_hosts is not defined"
 
   - fail:
       msg: This playbook requires g_nfs_hosts to be set
-    when: "{{ g_nfs_hosts is not defined }}"
+    when: "g_nfs_hosts is not defined"
 
   - fail:
       msg: The nfs group must be limited to one host
-    when: "{{ (groups[g_nfs_hosts] | default([])) | length > 1 }}"
+    when: "(groups[g_nfs_hosts] | default([])) | length > 1"
 
   - fail:
       msg: This playbook requires g_glusterfs_hosts to be set
-    when: "{{ g_glusterfs_hosts is not defined }}"
+    when: "g_glusterfs_hosts is not defined"
 
   - name: Evaluate oo_all_hosts
     add_host:
@@ -86,7 +86,7 @@
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
       ansible_become: "{{ g_sudo | default(omit) }}"
     with_items: "{{ g_master_hosts | default([]) }}"
-    when: "{{ g_nodeonmaster | default(false) | bool and not g_new_node_hosts | default(false) | bool }}"
+    when: "g_nodeonmaster | default(false) | bool and not g_new_node_hosts | default(false) | bool"
     changed_when: no
 
   - name: Evaluate oo_first_etcd
@@ -94,7 +94,7 @@
       name: "{{ g_etcd_hosts[0] }}"
       groups: oo_first_etcd
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
-    when: "{{ g_etcd_hosts|length > 0 }}"
+    when: "g_etcd_hosts|length > 0"
     changed_when: no
 
   - name: Evaluate oo_first_master
@@ -103,7 +103,7 @@
       groups: oo_first_master
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
       ansible_become: "{{ g_sudo | default(omit) }}"
-    when: "{{ g_master_hosts|length > 0 }}"
+    when: "g_master_hosts|length > 0"
     changed_when: no
 
   - name: Evaluate oo_lb_to_config
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_scheduler.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_scheduler.yml
index 88f2ddc78..40e066b7d 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_scheduler.yml
+++ b/playbooks/common/openshift-cluster/upgrades/upgrade_scheduler.yml
@@ -63,12 +63,12 @@
   - block:
     - debug:
         msg: "WARNING: openshift_master_scheduler_predicates is set to defaults from an earlier release of OpenShift current defaults are: {{ openshift_master_scheduler_default_predicates }}"
-      when: "{{ openshift_master_scheduler_predicates in older_predicates + older_predicates_no_region + [prev_predicates] + [prev_predicates_no_region] }}"
+      when: "openshift_master_scheduler_predicates in older_predicates + older_predicates_no_region + [prev_predicates] + [prev_predicates_no_region]"
 
     - debug:
         msg: "WARNING: openshift_master_scheduler_predicates does not match current defaults of: {{ openshift_master_scheduler_default_predicates }}"
-      when: "{{ openshift_master_scheduler_predicates != openshift_master_scheduler_default_predicates }}"
-    when: "{{ openshift_master_scheduler_predicates | default(none) is not none }}"
+      when: "openshift_master_scheduler_predicates != openshift_master_scheduler_default_predicates"
+    when: "openshift_master_scheduler_predicates | default(none) is not none"
 
   # Handle cases where openshift_master_predicates is not defined
   - block:
@@ -87,7 +87,7 @@
       when: "{{ openshift_master_scheduler_current_predicates != default_predicates_no_region and
                 openshift_master_scheduler_current_predicates in older_predicates_no_region + [prev_predicates_no_region] }}"
 
-    when: "{{ openshift_master_scheduler_predicates | default(none) is none }}"
+    when: "openshift_master_scheduler_predicates | default(none) is none"
 
 
 # Upgrade priorities
@@ -120,12 +120,12 @@
   - block:
     - debug:
         msg: "WARNING: openshift_master_scheduler_priorities is set to defaults from an earlier release of OpenShift current defaults are: {{ openshift_master_scheduler_default_priorities }}"
-      when: "{{ openshift_master_scheduler_priorities in older_priorities + older_priorities_no_zone + [prev_priorities] + [prev_priorities_no_zone] }}"
+      when: "openshift_master_scheduler_priorities in older_priorities + older_priorities_no_zone + [prev_priorities] + [prev_priorities_no_zone]"
 
     - debug:
         msg: "WARNING: openshift_master_scheduler_priorities does not match current defaults of: {{ openshift_master_scheduler_default_priorities }}"
-      when: "{{ openshift_master_scheduler_priorities != openshift_master_scheduler_default_priorities }}"
-    when: "{{ openshift_master_scheduler_priorities | default(none) is not none }}"
+      when: "openshift_master_scheduler_priorities != openshift_master_scheduler_default_priorities"
+    when: "openshift_master_scheduler_priorities | default(none) is not none"
 
   # Handle cases where openshift_master_priorities is not defined
   - block:
@@ -144,7 +144,7 @@
       when: "{{ openshift_master_scheduler_current_priorities != default_priorities_no_zone and
                 openshift_master_scheduler_current_priorities in older_priorities_no_zone + [prev_priorities_no_zone] }}"
 
-    when: "{{ openshift_master_scheduler_priorities | default(none) is none }}"
+    when: "openshift_master_scheduler_priorities | default(none) is none"
 
 
 # Update scheduler
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_3/master_config_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_3/master_config_upgrade.yml
index 68c71a132..d69472fad 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_3/master_config_upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_3/master_config_upgrade.yml
@@ -53,7 +53,7 @@
     dest: "{{ openshift.common.config_base}}/master/master-config.yaml"
     yaml_key: 'admissionConfig.pluginConfig'
     yaml_value: "{{ openshift.master.admission_plugin_config }}"
-  when: "{{ 'admission_plugin_config' in openshift.master }}"
+  when: "'admission_plugin_config' in openshift.master"
 
 - modify_yaml:
     dest: "{{ openshift.common.config_base}}/master/master-config.yaml"
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_4/master_config_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_4/master_config_upgrade.yml
index 43c2ffcd4..ed89dbe8d 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_4/master_config_upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_4/master_config_upgrade.yml
@@ -3,7 +3,7 @@
     dest: "{{ openshift.common.config_base}}/master/master-config.yaml"
     yaml_key: 'admissionConfig.pluginConfig'
     yaml_value: "{{ openshift.master.admission_plugin_config }}"
-  when: "{{ 'admission_plugin_config' in openshift.master }}"
+  when: "'admission_plugin_config' in openshift.master"
 
 - modify_yaml:
     dest: "{{ openshift.common.config_base}}/master/master-config.yaml"