Merge pull request #3704 from edx/feanil/update-ansible

Upgrade to latest ansible.

playbooks/edx-east/create_rds_secondary.yml

@@ -16,7 +16,7 @@
     - name: Validate arguments
       fail:
         msg: "One or more arguments were not set correctly: {{ item }}"
-      when: not {{ item }}
+      when: not item
       with_items:
         - from_db
         - rds_name

playbooks/edx-east/promote_rds_secondary.yml

@@ -21,7 +21,7 @@
     - name: Validate arguments
       fail:
         msg: "One or more arguments were not set correctly: {{ item }}"
-      when: not {{ item }}
+      when: not item
       with_items:
         - rds_name
         - admin_password
@@ -52,7 +52,7 @@
     - name: Modify edxapp history RDS
       shell: >
         aws rds modify-db-instance
-        --db-instance-identifier {{ rds_name }}        
+        --db-instance-identifier {{ rds_name }}
         --apply-immediately
         --multi-az
         --master-user-password {{ admin_password }}

playbooks/roles/automated/tasks/main.yml

@@ -61,7 +61,6 @@
     group: "root"
     mode: "0440"
     validate: 'visudo -cf %s'
-  when: automated_sudoers_template
   with_dict: "{{ AUTOMATED_USERS }}"
   
 - name: Create .ssh directory

playbooks/roles/ecommerce/meta/main.yml

@@ -9,7 +9,7 @@
 #
 ##
 # Role includes for role ecommerce
-# 
+#
 dependencies:
   - common
   - supervisor
@@ -25,6 +25,6 @@ dependencies:
   - role: edx_themes
     theme_users:
       - "{{ ecommerce_user }}"
-    when: "{{ ECOMMERCE_ENABLE_COMPREHENSIVE_THEMING }}"
+    when: ECOMMERCE_ENABLE_COMPREHENSIVE_THEMING
 
   - oraclejdk

playbooks/roles/edxapp/meta/main.yml

@@ -7,4 +7,4 @@ dependencies:
   - role: edx_themes
     theme_users:
       - "{{ edxapp_user }}"
-    when: "{{ EDXAPP_ENABLE_COMPREHENSIVE_THEMING }}"
+    when: EDXAPP_ENABLE_COMPREHENSIVE_THEMING

playbooks/roles/mount_ebs/tasks/main.yml

@@ -23,7 +23,7 @@
     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 }}"
     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 }}"
 
 # Noop & reports "ok" if fstype is correct

playbooks/roles/notifier/tasks/deploy.yml

@@ -103,7 +103,7 @@
     chdir: "{{ NOTIFIER_CODE_DIR }}"
   become: true
   become_user: "{{ notifier_user }}"
-  environment: notifier_env_vars
+  environment: "{{ notifier_env_vars }}"
   when: migrate_db is defined and migrate_db|lower == "yes"
   tags:
     - "install"

playbooks/roles/splunk-server/tasks/main.yml

@@ -10,13 +10,13 @@
 #
 #
 # Tasks for role splunk-server
-# 
+#
 # Overview:
-# 
+#
 #
 # Dependencies:
 #
-# 
+#
 # Example play:
 #
 #
@@ -44,7 +44,7 @@
     owner: splunk
     group: splunk
     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:
     - [forwarder.pem, cacert.pem]
     - ["{{ SPLUNK_SSL_CERT }}", "{{ SPLUNK_SSL_ROOT_CA }}"]
@@ -150,9 +150,9 @@
     - install:configuration
 
 - name: restart splunk
-  service: 
+  service:
     name: splunk
-    state: restarted 
+    state: restarted
   tags:
     - "install"
     - "install:configuration"

playbooks/roles/splunkforwarder/tasks/main.yml

@@ -115,7 +115,7 @@
     owner: splunk
     group: splunk
     mode: "0400"
-  when: "{{ item.ssl_cert is defined }}"
+  when: item.ssl_cert is defined
   with_items: "{{ SPLUNKFORWARDER_SERVERS }}"
 
 - name: Write root CA to disk
@@ -125,7 +125,7 @@
     owner: splunk
     group: splunk
     mode: "0400"
-  when: "{{ item.ssl_cert is defined }}"
+  when: item.ssl_cert is defined
   with_items: "{{ SPLUNKFORWARDER_SERVERS }}"
 
 - name: Create inputs and outputs configuration

requirements.txt

-ansible==2.2.0.0
+ansible==2.3.1.0
 PyYAML==3.12
 Jinja2==2.8
 MarkupSafe==0.23