Commit bec0d4ee by Ned Batchelder Committed by Feanil Patel

Remove objectionable braces from when: conditions

parent ab9fdb72
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
- name: Validate arguments - name: Validate arguments
fail: fail:
msg: "One or more arguments were not set correctly: {{ item }}" msg: "One or more arguments were not set correctly: {{ item }}"
when: not {{ item }} when: not item
with_items: with_items:
- from_db - from_db
- rds_name - rds_name
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
- name: Validate arguments - name: Validate arguments
fail: fail:
msg: "One or more arguments were not set correctly: {{ item }}" msg: "One or more arguments were not set correctly: {{ item }}"
when: not {{ item }} when: not item
with_items: with_items:
- rds_name - rds_name
- admin_password - admin_password
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
- name: Modify edxapp history RDS - name: Modify edxapp history RDS
shell: > shell: >
aws rds modify-db-instance aws rds modify-db-instance
--db-instance-identifier {{ rds_name }} --db-instance-identifier {{ rds_name }}
--apply-immediately --apply-immediately
--multi-az --multi-az
--master-user-password {{ admin_password }} --master-user-password {{ admin_password }}
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- name: Check Configuration Sources - name: Check Configuration Sources
fail: fail:
msg: "Configuration Sources Checking (COMMON_EXTRA_CONFIGURATION_SOURCES_CHECKING) is enabled, you must define {{ item }}" msg: "Configuration Sources Checking (COMMON_EXTRA_CONFIGURATION_SOURCES_CHECKING) is enabled, you must define {{ item }}"
when: COMMON_EXTRA_CONFIGURATION_SOURCES_CHECKING and ({{ item }} is not defined or {{ item }} != True) when: COMMON_EXTRA_CONFIGURATION_SOURCES_CHECKING and (item is not defined or item != True)
with_items: "{{ COMMON_EXTRA_CONFIGURATION_SOURCES }}" with_items: "{{ COMMON_EXTRA_CONFIGURATION_SOURCES }}"
tags: tags:
- "install" - "install"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
# #
## ##
# Role includes for role ecommerce # Role includes for role ecommerce
# #
dependencies: dependencies:
- common - common
- supervisor - supervisor
...@@ -25,6 +25,6 @@ dependencies: ...@@ -25,6 +25,6 @@ dependencies:
- role: edx_themes - role: edx_themes
theme_users: theme_users:
- "{{ ecommerce_user }}" - "{{ ecommerce_user }}"
when: "{{ ECOMMERCE_ENABLE_COMPREHENSIVE_THEMING }}" when: ECOMMERCE_ENABLE_COMPREHENSIVE_THEMING
- oraclejdk - oraclejdk
...@@ -7,4 +7,4 @@ dependencies: ...@@ -7,4 +7,4 @@ dependencies:
- role: edx_themes - role: edx_themes
theme_users: theme_users:
- "{{ edxapp_user }}" - "{{ edxapp_user }}"
when: "{{ EDXAPP_ENABLE_COMPREHENSIVE_THEMING }}" when: EDXAPP_ENABLE_COMPREHENSIVE_THEMING
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
src: "{{ (ansible_mounts | selectattr('device', 'equalto', item.device) | first | default({'device': None})).device }}" src: "{{ (ansible_mounts | selectattr('device', 'equalto', item.device) | first | default({'device': None})).device }}"
fstype: "{{ (ansible_mounts | selectattr('device', 'equalto', item.device) | first | default({'fstype': None})).fstype }}" fstype: "{{ (ansible_mounts | selectattr('device', 'equalto', item.device) | first | default({'fstype': None})).fstype }}"
state: unmounted state: unmounted
when: "{{ UNMOUNT_DISKS and (ansible_mounts | selectattr('device', 'equalto', item.device) | first | default({'fstype': None})).fstype != item.fstype }}" when: UNMOUNT_DISKS and (ansible_mounts | selectattr('device', 'equalto', item.device) | first | default({'fstype': None})).fstype != item.fstype
with_items: "{{ volumes }}" with_items: "{{ volumes }}"
# Noop & reports "ok" if fstype is correct # Noop & reports "ok" if fstype is correct
......
...@@ -10,13 +10,13 @@ ...@@ -10,13 +10,13 @@
# #
# #
# Tasks for role splunk-server # Tasks for role splunk-server
# #
# Overview: # Overview:
# #
# #
# Dependencies: # Dependencies:
# #
# #
# Example play: # Example play:
# #
# #
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
owner: splunk owner: splunk
group: splunk group: splunk
mode: "0400" mode: "0400"
when: "{{ SPLUNK_SSL_CERT is defined and SPLUNK_SSL_CERT | length > 0 }}" when: SPLUNK_SSL_CERT is defined and SPLUNK_SSL_CERT | length > 0
with_together: with_together:
- [forwarder.pem, cacert.pem] - [forwarder.pem, cacert.pem]
- ["{{ SPLUNK_SSL_CERT }}", "{{ SPLUNK_SSL_ROOT_CA }}"] - ["{{ SPLUNK_SSL_CERT }}", "{{ SPLUNK_SSL_ROOT_CA }}"]
...@@ -150,9 +150,9 @@ ...@@ -150,9 +150,9 @@
- install:configuration - install:configuration
- name: restart splunk - name: restart splunk
service: service:
name: splunk name: splunk
state: restarted state: restarted
tags: tags:
- "install" - "install"
- "install:configuration" - "install:configuration"
......
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
owner: splunk owner: splunk
group: splunk group: splunk
mode: "0400" mode: "0400"
when: "{{ item.ssl_cert is defined }}" when: item.ssl_cert is defined
with_items: "{{ SPLUNKFORWARDER_SERVERS }}" with_items: "{{ SPLUNKFORWARDER_SERVERS }}"
- name: Write root CA to disk - name: Write root CA to disk
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
owner: splunk owner: splunk
group: splunk group: splunk
mode: "0400" mode: "0400"
when: "{{ item.ssl_cert is defined }}" when: item.ssl_cert is defined
with_items: "{{ SPLUNKFORWARDER_SERVERS }}" with_items: "{{ SPLUNKFORWARDER_SERVERS }}"
- name: Create inputs and outputs configuration - name: Create inputs and outputs configuration
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment