Merge pull request #4049 from mitodl/open-release/ficus.master

Added install:configuration tag to step that sets up forum env

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/aws/tasks/main.yml

@@ -31,23 +31,17 @@
     - deploy
 
 - name: Set the MTU to 1500 temporarily
-  shell: /sbin/ifconfig eth0 mtu 1500 up
+  shell: "/sbin/ifconfig {{ ansible_default_ipv4.interface }} mtu 1500 up"
   when: ansible_distribution in common_debian_variants
 
-- name: Check for eth0.cfg
-  stat:
-    path: /etc/network/interfaces.d/eth0.cfg
-  register: eth0_cfg
+- name: Set the MTU to 1500 permanently
+  template:
+    dest: /etc/network/if-up.d/mtu
+    src: mtu.j2
+    mode: 0755
+    owner: root
+    group: root
   when: ansible_distribution in common_debian_variants
-
-- name: Set the MTU to 1500 inside eth0.cfg file
-  lineinfile:
-    dest: /etc/network/interfaces.d/eth0.cfg
-    regexp: "^post-up /sbin/ifconfig eth0 mtu 1500"
-    line: "post-up /sbin/ifconfig eth0 mtu 1500"
-    insertafter: "^iface"
-  when: ansible_distribution in common_debian_variants and eth0_cfg.stat.exists
-
 #
 # End dealing with Jumbo frames issue in mixed MTU deployements in AWS
 #

playbooks/roles/aws/templates/mtu.j2

+#!/bin/sh
+ifconfig {{ ansible_default_ipv4.interface }} mtu 1500

playbooks/roles/common_vars/defaults/main.yml

@@ -207,3 +207,5 @@ COMMON_TRACKING_LOG_ROTATION:
 # COMMON_USING_SECURE_REPO: true
 COMMON_EXTRA_CONFIGURATION_SOURCES_CHECKING: false
 COMMON_EXTRA_CONFIGURATION_SOURCES: []
+
+COMMON_ENABLE_AWS_ROLE: true

playbooks/roles/edxapp/defaults/main.yml

@@ -76,6 +76,7 @@ EDXAPP_MYSQL_USER_ADMIN: 'root'
 EDXAPP_MYSQL_PASSWORD: 'password'
 EDXAPP_MYSQL_PASSWORD_READ_ONLY: 'password'
 EDXAPP_MYSQL_PASSWORD_ADMIN: 'password'
+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 }}"
@@ -317,6 +318,8 @@ EDXAPP_FOOTER_ORGANIZATION_IMAGE: "images/logo.png"
 
 EDXAPP_ENV_EXTRA: {}
 EDXAPP_AUTH_EXTRA: {}
+EDXAPP_LMS_ENV_EXTRA: "{{ EDXAPP_ENV_EXTRA }}"
+EDXAPP_CMS_ENV_EXTRA: "{{ EDXAPP_ENV_EXTRA }}"
 EDXAPP_LMS_AUTH_EXTRA: "{{ EDXAPP_AUTH_EXTRA }}"
 EDXAPP_CMS_AUTH_EXTRA: "{{ EDXAPP_AUTH_EXTRA }}"
 EDXAPP_ENABLE_MKTG_SITE: false
@@ -736,7 +739,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 }}"
   student_module_history:
     ENGINE: 'django.db.backends.mysql'
@@ -1073,6 +1076,7 @@ cms_auth_config:
                 fs_root:  "{{ edxapp_course_data_dir }}"
                 render_template: 'edxmako.shortcuts.render_to_string'
   PARSE_KEYS: "{{ EDXAPP_PARSE_KEYS }}"
+
 cms_env_config:
   <<: *edxapp_generic_env
   SITE_NAME:  "{{ EDXAPP_CMS_SITE_NAME }}"

playbooks/roles/edxapp/tasks/deploy.yml

@@ -300,7 +300,7 @@
     - install:app-requirements
 
 - name: compiling all py files in the edx-platform repo
-  shell: "{{ edxapp_venv_bin }}/python -m compileall -q -x .git/.* {{ edxapp_code_dir }}"
+  shell: "{{ edxapp_venv_bin }}/python -m compileall -q -x '.git/.*|node_modules/.*' {{ edxapp_code_dir }}"
   become_user: "{{ edxapp_user }}"
   tags:
     - install

playbooks/roles/edxapp/templates/cms.env.json.j2

-{% do cms_env_config.update(EDXAPP_ENV_EXTRA) %}
+{% do cms_env_config.update(EDXAPP_CMS_ENV_EXTRA) %}
 {% for key, value in cms_env_config.iteritems() -%}
   {% if value == 'None' -%}
     {% do cms_env_config.update({key: None }) %}

playbooks/roles/edxapp/templates/lms.env.json.j2

-{% do lms_env_config.update(EDXAPP_ENV_EXTRA) %}
+{% do lms_env_config.update(EDXAPP_LMS_ENV_EXTRA) %}
 {% for key, value in lms_env_config.iteritems() -%}
   {% if value == 'None' -%}
-    {% do lms_env_config.update({key: None }) %} 
+    {% do lms_env_config.update({key: None }) %}
   {%- endif %}
 {%- endfor %}
 {{ lms_env_config | to_nice_json }}

playbooks/roles/forum/tasks/main.yml

@@ -56,6 +56,7 @@
   tags:
     - install
     - install:base
+    - install:configuration
 
 - name: create {{ forum_data_dir }}
   file: