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

@@ -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

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

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
 

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
 

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

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

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

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

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"

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"

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
 

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
 

roles/openshift_certificate_expiry/filter_plugins/oo_cert_expiry.py

@@ -35,7 +35,7 @@ Example playbook usage:
     become: no
     run_once: yes
     delegate_to: localhost
-    when: "{{ openshift_certificate_expiry_save_json_results|bool }}"
+    when: "openshift_certificate_expiry_save_json_results|bool"
     copy:
       content: "{{ hostvars|oo_cert_expiry_results_to_json() }}"
       dest: "{{ openshift_certificate_expiry_json_results_path }}"

roles/openshift_certificate_expiry/tasks/main.yml

@@ -13,12 +13,12 @@
     src: cert-expiry-table.html.j2
     dest: "{{ openshift_certificate_expiry_html_report_path }}"
   delegate_to: localhost
-  when: "{{ openshift_certificate_expiry_generate_html_report|bool }}"
+  when: "openshift_certificate_expiry_generate_html_report|bool"
 
 - name: Generate the result JSON string
   run_once: yes
   set_fact: json_result_string="{{ hostvars|oo_cert_expiry_results_to_json(play_hosts) }}"
-  when: "{{ openshift_certificate_expiry_save_json_results|bool }}"
+  when: "openshift_certificate_expiry_save_json_results|bool"
 
 - name: Generate results JSON file
   become: no
@@ -27,4 +27,4 @@
     src: save_json_results.j2
     dest: "{{ openshift_certificate_expiry_json_results_path }}"
   delegate_to: localhost
-  when: "{{ openshift_certificate_expiry_save_json_results|bool }}"
+  when: "openshift_certificate_expiry_save_json_results|bool"

roles/openshift_logging/tasks/generate_routes.yaml

@@ -1,14 +1,14 @@
 ---
 - set_fact: kibana_key={{ lookup('file', openshift_logging_kibana_key) | b64encode }}
-  when: "{{ openshift_logging_kibana_key | trim | length > 0 }}"
+  when: "openshift_logging_kibana_key | trim | length > 0"
   changed_when: false
 
 - set_fact: kibana_cert={{ lookup('file', openshift_logging_kibana_cert)| b64encode  }}
-  when: "{{openshift_logging_kibana_cert | trim | length > 0}}"
+  when: "openshift_logging_kibana_cert | trim | length > 0"
   changed_when: false
 
 - set_fact: kibana_ca={{ lookup('file', openshift_logging_kibana_ca)| b64encode  }}
-  when: "{{openshift_logging_kibana_ca | trim | length > 0}}"
+  when: "openshift_logging_kibana_ca | trim | length > 0"
   changed_when: false
 
 - set_fact: kibana_ca={{key_pairs | entry_from_named_pair('ca_file') }}

roles/openshift_logging/tasks/main.yaml

@@ -1,7 +1,7 @@
 ---
 - fail:
     msg: Only one Fluentd nodeselector key pair should be provided
-  when: "{{ openshift_logging_fluentd_nodeselector.keys() | count }} > 1"
+  when: "openshift_logging_fluentd_nodeselector.keys() | count > 1"
 
 - name: Set default image variables based on deployment_type
   include_vars: "{{ item }}"

roles/openshift_master_facts/tasks/main.yml

@@ -128,10 +128,10 @@
   - name: Test if scheduler config is readable
     fail:
       msg: "Unknown scheduler config apiVersion {{ openshift_master_scheduler_config.apiVersion }}"
-    when: "{{ openshift_master_scheduler_current_config.apiVersion | default(None) != 'v1' }}"
+    when: "openshift_master_scheduler_current_config.apiVersion | default(None) != 'v1'"
 
   - name: Set current scheduler predicates and priorities
     set_fact:
       openshift_master_scheduler_current_predicates: "{{ openshift_master_scheduler_current_config.predicates }}"
       openshift_master_scheduler_current_priorities: "{{ openshift_master_scheduler_current_config.priorities }}"
-  when: "{{ scheduler_config_stat.stat.exists }}"
+  when: "scheduler_config_stat.stat.exists"

roles/openshift_metrics/tasks/install_heapster.yaml

@@ -22,7 +22,7 @@
   with_items:
     - hawkular-metrics-certs
     - hawkular-metrics-account
-  when: "not {{ openshift_metrics_heapster_standalone | bool }}"
+  when: "not openshift_metrics_heapster_standalone | bool"
 
 - name: Generating serviceaccount for heapster
   template: src=serviceaccount.j2 dest={{mktemp.stdout}}/templates/metrics-{{obj_name}}-sa.yaml

roles/openshift_metrics/tasks/install_metrics.yaml

@@ -10,11 +10,11 @@
     - cassandra
   loop_control:
     loop_var: include_file
-  when: "not {{ openshift_metrics_heapster_standalone | bool }}"
+  when: "not openshift_metrics_heapster_standalone | bool"
 
 - name: Install Heapster Standalone
   include: install_heapster.yaml
-  when: "{{ openshift_metrics_heapster_standalone | bool }}"
+  when: "openshift_metrics_heapster_standalone | bool"
 
 - find: paths={{ mktemp.stdout }}/templates patterns=*.yaml
   register: object_def_files
@@ -48,7 +48,7 @@
 
 - name: Scaling down cluster to recognize changes
   include: stop_metrics.yaml
-  when: "{{ existing_metrics_rc.stdout_lines | length > 0 }}"
+  when: "existing_metrics_rc.stdout_lines | length > 0"
 
 - name: Scaling up cluster
   include: start_metrics.yaml

roles/openshift_metrics/tasks/main.yaml

@@ -19,7 +19,7 @@
 - name: Create temp directory for all our templates
   file: path={{mktemp.stdout}}/templates state=directory mode=0755
   changed_when: False
-  when: "{{ openshift_metrics_install_metrics | bool }}"
+  when: "openshift_metrics_install_metrics | bool"
 
 - name: Create temp directory local on control node
   local_action: command mktemp -d

roles/openshift_metrics/tasks/start_metrics.yaml

@@ -20,7 +20,7 @@
   loop_control:
     loop_var: object
   when: metrics_cassandra_rc is defined
-  changed_when: "{{metrics_cassandra_rc | length > 0 }}"
+  changed_when: "metrics_cassandra_rc | length > 0"
 
 - command: >
     {{openshift.common.client_binary}}
@@ -42,7 +42,7 @@
   with_items: "{{metrics_metrics_rc.stdout_lines}}"
   loop_control:
     loop_var: object
-  changed_when: "{{metrics_metrics_rc | length > 0 }}"
+  changed_when: "metrics_metrics_rc | length > 0"
 
 - command: >
     {{openshift.common.client_binary}}

roles/openshift_metrics/tasks/stop_metrics.yaml

@@ -41,7 +41,7 @@
   with_items: "{{metrics_hawkular_rc.stdout_lines}}"
   loop_control:
     loop_var: object
-  changed_when: "{{metrics_hawkular_rc | length > 0 }}"
+  changed_when: "metrics_hawkular_rc | length > 0"
 
 - command: >
     {{openshift.common.client_binary}} --config={{mktemp.stdout}}/admin.kubeconfig
@@ -63,4 +63,4 @@
   loop_control:
     loop_var: object
   when: metrics_cassandra_rc is defined
-  changed_when: "{{metrics_cassandra_rc | length > 0 }}"
+  changed_when: "metrics_cassandra_rc | length > 0"

roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml

@@ -45,4 +45,4 @@
 
 - name: Create GlusterFS registry volume
   command: "heketi-cli -s http://{{ openshift_storage_glusterfs_heketi_url }} --user admin --secret '{{ openshift_storage_glusterfs_heketi_admin_key }}' volume create --size={{ openshift.hosted.registry.storage.volume.size | replace('Gi','') }} --name={{ openshift.hosted.registry.storage.glusterfs.path }}"
-  when: "'{{ openshift.hosted.registry.storage.glusterfs.path }}' not in registry_volume.stdout"
+  when: "'openshift.hosted.registry.storage.glusterfs.path' not in registry_volume.stdout"