From a777dc8c1a97cb9a503cbf56b955541500b16acb Mon Sep 17 00:00:00 2001
From: Major Hayden <major@mhtx.net>
Date: Wed, 29 Nov 2017 13:16:32 -0600
Subject: [PATCH] Remove jinja2 delimiters in when

This patch removes some lingering jinja2 delimiters in when clauses.

Change-Id: Ia1d7e8c70ce322f487c4cacb72249704e2d46cf6
---
 playbooks/galera-install.yml                            | 4 ++--
 playbooks/os-keystone-install.yml                       | 4 ++--
 tests/roles/bootstrap-host/tasks/prepare_aio_config.yml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/playbooks/galera-install.yml b/playbooks/galera-install.yml
index 015db393ba..a23c613bec 100644
--- a/playbooks/galera-install.yml
+++ b/playbooks/galera-install.yml
@@ -51,12 +51,12 @@
     - role: haproxy_endpoints
       haproxy_state: disabled
       static: no
-      when: "{{ groups['haproxy'] | default([]) | length > 0 }}"
+      when: "groups['haproxy'] | default([]) | length > 0"
     - role: "galera_server"
     - role: haproxy_endpoints
       haproxy_state: enabled
       static: no
-      when: "{{ groups['haproxy'] | default([]) | length > 0 }}"
+      when: "groups['haproxy'] | default([]) | length > 0"
     - role: "rsyslog_client"
       rsyslog_client_log_rotate_file: galera_log_rotate
       rsyslog_client_log_dir: "/var/log/mysql_logs"
diff --git a/playbooks/os-keystone-install.yml b/playbooks/os-keystone-install.yml
index 789773d8a6..e5e11aef0e 100644
--- a/playbooks/os-keystone-install.yml
+++ b/playbooks/os-keystone-install.yml
@@ -77,7 +77,7 @@
       vars:
         haproxy_backend: "{{ item }}"
         haproxy_state: disabled
-      when: "{{ groups['keystone_all'] | length > 1 }}"
+      when: "groups['keystone_all'] | length > 1"
       with_items:
         - "keystone_service-back"
         - "keystone_admin-back"
@@ -142,7 +142,7 @@
       vars:
         haproxy_backend: "{{ item }}"
         haproxy_state: enabled
-      when: "{{ groups['keystone_all'] | length > 1 }}"
+      when: "groups['keystone_all'] | length > 1"
       with_items:
         - "keystone_service-back"
         - "keystone_admin-back"
diff --git a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
index d282dd4b12..5e9c2e2cf7 100644
--- a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
+++ b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
@@ -192,7 +192,7 @@
   with_items:
     - /etc/openstack_deploy/group_vars
     - /etc/openstack_deploy/host_vars
-  when: "{{ (lookup('env','ACTION') | default(false,true)) == 'varstest' }}"
+  when: "(lookup('env','ACTION') | default(false,true)) == 'varstest'"
 
 - name: Create user-space overrides
   lineinfile: