Merge pull request #4125 from edx/george/ospr-1876

Optional `aws` role and `EDXAPP_MYSQL_ATOMIC_REQUESTS`

playbooks/edx-east/edxapp.yml

@@ -7,7 +7,8 @@
     CLUSTER_NAME: 'edxapp'
   serial: "{{ serial_count }}"
   roles:
-   - aws
+   - role: aws
+     when: COMMON_ENABLE_AWS_ROLE
    - role: automated
      AUTOMATED_USERS: "{{ EDXAPP_AUTOMATED_USERS | default({}) }}"
    - role: nginx

playbooks/roles/common_vars/defaults/main.yml

@@ -222,3 +222,5 @@ COMMON_JWT_SECRET_KEY: 'SET-ME-PLEASE'
 
 # Set worker user default
 CREATE_SERVICE_WORKER_USERS: True
+
+COMMON_ENABLE_AWS_ROLE: true

playbooks/roles/edxapp/defaults/main.yml

@@ -79,6 +79,7 @@ EDXAPP_MYSQL_PASSWORD: 'password'
 EDXAPP_MYSQL_PASSWORD_READ_ONLY: 'password'
 EDXAPP_MYSQL_PASSWORD_ADMIN: 'password'
 EDXAPP_MYSQL_OPTIONS: {}
+EDXAPP_MYSQL_ATOMIC_REQUESTS: True
 EDXAPP_MYSQL_REPLICA_DB_NAME: "{{ EDXAPP_MYSQL_DB_NAME }}"
 EDXAPP_MYSQL_REPLICA_USER: "{{ EDXAPP_MYSQL_USER }}"
 EDXAPP_MYSQL_REPLICA_PASSWORD: "{{ EDXAPP_MYSQL_PASSWORD }}"
@@ -877,7 +878,7 @@ edxapp_databases:
     PASSWORD: "{{ EDXAPP_MYSQL_PASSWORD }}"
     HOST: "{{ EDXAPP_MYSQL_HOST }}"
     PORT: "{{ EDXAPP_MYSQL_PORT }}"
-    ATOMIC_REQUESTS: True
+    ATOMIC_REQUESTS: "{{ EDXAPP_MYSQL_ATOMIC_REQUESTS }}"
     CONN_MAX_AGE: "{{ EDXAPP_MYSQL_CONN_MAX_AGE }}"
     OPTIONS: "{{ EDXAPP_MYSQL_OPTIONS }}"
   student_module_history:

playbooks/roles/forum/tasks/main.yml

@@ -56,6 +56,7 @@
   tags:
     - install
     - install:base
+    - install:configuration
   with_items:
     - "{{ forum_env }}"