Merge branch 'master' into max/merge-refactor

.travis.yml

 # Travis CI configuration file for running tests
 language: python
+branches:
+  only:
+    - master
 python:
   - "2.7"
 install:

playbooks/roles/alton/templates/alton.conf.j2

@@ -3,8 +3,8 @@
 command={{ alton_supervisor_wrapper }}
 priority=999
 user={{ common_web_user }}
-stdout_logfile={{ supervisor_log_dir }}/%(program_name)-stdout.log
-stderr_logfile={{ supervisor_log_dir }}/%(program_name)-stderr.log
+stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
+stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log
 killasgroup=true
 stopasgroup=true
 stopsignal=QUIT

playbooks/roles/analytics_api/templates/edx/app/supervisor/conf.d.available/analytics_api.conf.j2

@@ -5,7 +5,7 @@
 command={{ analytics_api_home }}/{{ analytics_api_service_name }}.sh
 user={{ common_web_user }}
 directory={{ analytics_api_code_dir }}
-stdout_logfile={{ supervisor_log_dir }}/%(program_name)-stdout.log
-stderr_logfile={{ supervisor_log_dir }}/%(program_name)-stderr.log
+stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
+stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log
 killasgroup=true
 stopasgroup=true

playbooks/roles/aws/tasks/main.yml

@@ -24,9 +24,17 @@
 #
 # Start dealing with Jumbo frames issue in mixed MTU deployements in AWS
 #
-- lineinfile: dest=/etc/network/interfaces regexp=^mtu line="mtu 1500"
+- shell: >
+    /sbin/ifconfig eth0 mtu 1500 up
   when: ansible_distribution in common_debian_variants
 
+- lineinfile: >
+    dest=/etc/dhcp/dhclient.conf
+    regexp="^supercede interfact-mtu"
+    line="supercede interface-mtu 1500;"
+    insertbefore="^request"
+  when: ansible_distribution in common_debian_variants
+  
 #
 # End dealing with Jumbo frames issue in mixed MTU deployements in AWS
 #

playbooks/roles/certs/templates/certs.conf.j2

@@ -3,7 +3,7 @@ command={{ certs_venv_bin }}/python {{ certs_code_dir }}/certificate_agent.py
 priority=999
 environment=SERVICE_VARIANT="certs",HOME="/"
 user={{ common_web_user }}
-stdout_logfile={{ supervisor_log_dir }}/%(program_name)-stdout.log
-stderr_logfile={{ supervisor_log_dir }}/%(program_name)-stderr.log
+stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
+stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log
 killasgroup=true
 stopasgroup=true

playbooks/roles/common/templates/devstack_motd.tail.j2

 *******************************************************************
-*         _ __  __                                                *
-*   _   _| |\ \/ /                                                *
-* / -_) _` | >  <                                                 *
-* \___\__,_|/_/\_\                                                *
+*   ___                         _ __  __                          *
+*  / _ \ _ __ ___ _ _    ___ __| |\ \/ /                          *
+* | |_| | '_ \ -_) ' \  / -_) _` | >  <                           *
+*  \___/| .__/___|_|_|  \___\__,_|/_/\_\                          *
+*       |_|                                                       *
 *                                                                 *
 *  Instructions and troubleshooting:                              *
 *  https://github.com/edx/configuration/wiki/edX-Developer-Stack  *

playbooks/roles/devpi/templates/devpi.conf.j2

@@ -2,8 +2,8 @@
 command={{ devpi_venv_bin }}/devpi-server --port {{ devpi_port }} --serverdir {{ devpi_mirror_dir }}
 user={{ devpi_supervisor_user }}
 priority=999
-stdout_logfile={{ devpi_supervisor_log_dir }}/%(program_name)-stdout.log
-stderr_logfile={{ devpi_supervisor_log_dir }}/%(program_name)-stderr.log
+stdout_logfile={{ devpi_supervisor_log_dir }}/%(program_name)s-stdout.log
+stderr_logfile={{ devpi_supervisor_log_dir }}/%(program_name)s-stderr.log
 autostart=True
 killasgroup=true
 stopasgroup=true

playbooks/roles/discern/templates/discern.conf.j2

@@ -8,7 +8,7 @@ command={{ discern_venv_bin }}/gunicorn --preload -b {{ discern_gunicorn_host }}
 user={{ common_web_user }}
 directory={{ discern_code_dir }}
 environment=LANG={{ DISCERN_LANG }},DJANGO_SETTINGS_MODULE={{ discern_settings }},SERVICE_VARIANT=discern
-stdout_logfile={{ supervisor_log_dir }}/%(program_name)-stdout.log
-stderr_logfile={{ supervisor_log_dir }}/%(program_name)-stderr.log
+stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
+stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log
 killasgroup=true
 stopasgroup=true

playbooks/roles/discern/templates/discern_celery.conf.j2

@@ -7,8 +7,8 @@ directory={{ discern_code_dir }}
 
 environment=DJANGO_SETTINGS_MODULE=discern.aws,SERVICE_VARIANT=discern
 
-stdout_logfile={{ supervisor_log_dir }}/%(program_name)-stdout.log
-stderr_logfile={{ supervisor_log_dir }}/%(program_name)-stderr.log
+stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
+stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log
 
 killasgroup=true
 stopasgroup=true

playbooks/roles/edxapp/defaults/main.yml

@@ -414,6 +414,7 @@ EDXAPP_VIDEO_UPLOAD_PIPELINE:
   ROOT_PATH: ''
 
 EDXAPP_CORS_ORIGIN_WHITELIST: []
+EDXAPP_CORS_ORIGIN_ALLOW_ALL: false
 
 #-------- Everything below this line is internal to the role ------------
 
@@ -606,6 +607,7 @@ generic_cache_config: &default_generic_cache
 
 generic_env_config:  &edxapp_generic_env
   CORS_ORIGIN_WHITELIST: "{{ EDXAPP_CORS_ORIGIN_WHITELIST }}"
+  CORS_ORIGIN_ALLOW_ALL: "{{ EDXAPP_CORS_ORIGIN_ALLOW_ALL }}"
   VIDEO_UPLOAD_PIPELINE: "{{ EDXAPP_VIDEO_UPLOAD_PIPELINE }}"
   DEPRECATED_ADVANCED_COMPONENT_TYPES: "{{ EDXAPP_DEPRECATED_ADVANCED_COMPONENT_TYPES }}"
   OAUTH_OIDC_ISSUER: "https://{{ EDXAPP_LMS_BASE }}/oauth2"

playbooks/roles/edxapp/templates/cms.conf.j2

@@ -11,7 +11,7 @@ command={{ executable }} -c {{ edxapp_app_dir }}/cms_gunicorn.py {{ EDXAPP_CMS_G
 user={{ common_web_user }}
 directory={{ edxapp_code_dir }}
 environment={% if COMMON_ENABLE_NEWRELIC_APP %}NEW_RELIC_APP_NAME={{ EDXAPP_NEWRELIC_CMS_APPNAME }},NEW_RELIC_LICENSE_KEY={{ NEWRELIC_LICENSE_KEY }},{% endif -%}PORT={{ edxapp_cms_gunicorn_port }},ADDRESS={{ edxapp_cms_gunicorn_host }},LANG={{ EDXAPP_LANG }},DJANGO_SETTINGS_MODULE={{ EDXAPP_CMS_ENV }},SERVICE_VARIANT="cms"
-stdout_logfile={{ supervisor_log_dir }}/%(program_name)-stdout.log
-stderr_logfile={{ supervisor_log_dir }}/%(program_name)-stderr.log
+stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
+stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log
 killasgroup=true
 stopasgroup=true

playbooks/roles/edxapp/templates/lms.conf.j2

@@ -11,7 +11,7 @@ command={{ executable }} -c {{ edxapp_app_dir }}/lms_gunicorn.py lms.wsgi
 user={{ common_web_user }}
 directory={{ edxapp_code_dir }}
 environment={% if COMMON_ENABLE_NEWRELIC_APP %}NEW_RELIC_APP_NAME={{ EDXAPP_NEWRELIC_LMS_APPNAME }},NEW_RELIC_LICENSE_KEY={{ NEWRELIC_LICENSE_KEY }},{% endif -%}  PORT={{ edxapp_lms_gunicorn_port }},ADDRESS={{ edxapp_lms_gunicorn_host }},LANG={{ EDXAPP_LANG }},DJANGO_SETTINGS_MODULE={{ EDXAPP_LMS_ENV }},SERVICE_VARIANT="lms",PATH="{{ edxapp_deploy_path }}"
-stdout_logfile={{ supervisor_log_dir }}/%(program_name)-stdout.log
-stderr_logfile={{ supervisor_log_dir }}/%(program_name)-stderr.log
+stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
+stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log
 killasgroup=true
 stopasgroup=true

playbooks/roles/edxapp/templates/workers.conf.j2

@@ -4,8 +4,8 @@
 environment=CONCURRENCY={{ w.concurrency }},LOGLEVEL=info,DJANGO_SETTINGS_MODULE=aws,PYTHONPATH={{ edxapp_code_dir }},SERVICE_VARIANT={{ w.service_variant }}
 user={{ common_web_user }}
 directory={{ edxapp_code_dir }}
-stdout_logfile={{ supervisor_log_dir }}/%(program_name)-stdout.log
-stderr_logfile={{ supervisor_log_dir }}/%(program_name)-stderr.log
+stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
+stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log
 
 command={{ edxapp_venv_bin}}/python {{ edxapp_code_dir }}/manage.py {{ w.service_variant }} --settings=aws celery worker --loglevel=info --queues=edx.{{ w.service_variant }}.core.{{ w.queue }} --hostname=edx.{{ w.service_variant }}.core.{{ w.queue }}.%%h --concurrency={{ w.concurrency }}
 killasgroup=true

playbooks/roles/forum/templates/forum.conf.j2

@@ -2,8 +2,8 @@
 command={{ forum_supervisor_wrapper }}
 priority=999
 user={{ common_web_user }}
-stdout_logfile={{ supervisor_log_dir }}/%(program_name)-stdout.log
-stderr_logfile={{ supervisor_log_dir }}/%(program_name)-stderr.log
+stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
+stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log
 killasgroup=true
 stopasgroup=true
 stopsignal=QUIT

playbooks/roles/gitreload/templates/edx/app/supervisor/conf.available.d/gitreload.conf.j2

@@ -7,7 +7,7 @@ umask=002
 command={{ gitreload_venv }}/bin/gunicorn -c {{ gitreload_dir }}/gitreload_gunicorn.py {{ GITRELOAD_GUNICORN_EXTRA }} gitreload.web:app
 
 environment=PID=/var/tmp/gitreload.pid
-stdout_logfile={{ supervisor_log_dir }}/%(program_name)-stdout.log
-stderr_logfile={{ supervisor_log_dir }}/%(program_name)-stderr.log
+stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
+stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log
 killasgroup=true
 stopasgroup=true

playbooks/roles/insights/templates/edx/app/supervisor/conf.d.available/insights.conf.j2

@@ -5,7 +5,7 @@
 command={{ insights_app_dir }}/insights.sh
 user={{ common_web_user }}
 directory={{ insights_code_dir }}
-stdout_logfile={{ supervisor_log_dir }}/%(program_name)-stdout.log
-stderr_logfile={{ supervisor_log_dir }}/%(program_name)-stderr.log
+stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
+stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log
 killasgroup=true
 stopasgroup=true

playbooks/roles/jenkins_admin/templates/nat-monitor.conf.j2

@@ -6,8 +6,8 @@ environment=VPC_NAME="{{ m.vpc_name }}",AWS_DEFAULT_REGION="{{ m.region }}",AWS_
 user={{ jenkins_supervisor_service_user }}
 
 directory={{ jenkins_admin_scripts_dir }}
-stdout_logfile={{ jenkins_supervisor_log_dir }}/%(program_name)-stdout.log
-stderr_logfile={{ jenkins_supervisor_log_dir }}/%(program_name)-stderr.log
+stdout_logfile={{ jenkins_supervisor_log_dir }}/%(program_name)s-stdout.log
+stderr_logfile={{ jenkins_supervisor_log_dir }}/%(program_name)s-stderr.log
 
 command={{ jenkins_admin_scripts_dir }}/nat-monitor.sh
 killasgroup=true

playbooks/roles/newrelic/templates/s3watcher.conf.j2

@@ -2,8 +2,8 @@
 command={{ newrelic_s3watcher_dir }}/s3-watcher-supervisor.sh
 priority=999
 user={{ newrelic_plugin_user }}
-stdout_logfile={{ supervisor_log_dir }}/%(program_name)-stdout.log
-stderr_logfile={{ supervisor_log_dir }}/%(program_name)-stderr.log
+stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
+stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log
 killasgroup=true
 stopasgroup=true
 stopsignal=QUIT

playbooks/roles/ora/templates/ora.conf.j2

@@ -7,8 +7,8 @@ directory={{ ora_code_dir }}
 
 environment=PID=/var/run/gunicorn/edx-ora.pid,WORKERS={{ ora_gunicorn_workers }},PORT={{ ora_gunicorn_port }},ADDRESS={{ ora_gunicorn_host }},LANG={{ ORA_LANG }},DJANGO_SETTINGS_MODULE=edx_ora.aws,SERVICE_VARIANT=ora
 
-stdout_logfile={{ supervisor_log_dir }}/%(program_name)-stdout.log
-stderr_logfile={{ supervisor_log_dir }}/%(program_name)-stderr.log
+stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
+stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log
 killasgroup=true
 stopasgroup=true
 

playbooks/roles/ora/templates/ora_celery.conf.j2

@@ -7,8 +7,8 @@ directory={{ ora_code_dir }}
 
 environment=DJANGO_SETTINGS_MODULE=edx_ora.aws,SERVICE_VARIANT=ora
 
-stdout_logfile={{ supervisor_log_dir }}/%(program_name)-stdout.log
-stderr_logfile={{ supervisor_log_dir }}/%(program_name)-stderr.log
+stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
+stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log
 killasgroup=true
 stopasgroup=true
 

playbooks/roles/xqueue/templates/xqueue.conf.j2

@@ -13,7 +13,7 @@ directory={{ xqueue_code_dir }}
 
 environment={% if COMMON_ENABLE_NEWRELIC_APP %}NEW_RELIC_APP_NAME={{ XQUEUE_NEWRELIC_APPNAME }},NEW_RELIC_LICENSE_KEY={{ NEWRELIC_LICENSE_KEY }},{% endif -%}PID=/var/tmp/xqueue.pid,PORT={{ xqueue_gunicorn_port }},ADDRESS={{ xqueue_gunicorn_host }},LANG={{ XQUEUE_LANG }},DJANGO_SETTINGS_MODULE=xqueue.aws_settings,SERVICE_VARIANT="xqueue"
 
-stdout_logfile={{ supervisor_log_dir }}/%(program_name)-stdout.log
-stderr_logfile={{ supervisor_log_dir }}/%(program_name)-stderr.log
+stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
+stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log
 killasgroup=true
 stopasgroup=true

playbooks/roles/xqueue/templates/xqueue_consumer.conf.j2

@@ -7,8 +7,8 @@ directory={{ xqueue_code_dir }}
 
 environment=LANG={{ XQUEUE_LANG }},WORKERS_PER_QUEUE={{xqueue_env_config.XQUEUE_WORKERS_PER_QUEUE}},SERVICE_VARIANT="xqueue"
 
-stdout_logfile={{ supervisor_log_dir }}/%(program_name)-stdout.log
-stderr_logfile={{ supervisor_log_dir }}/%(program_name)-stderr.log
+stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
+stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log
 killasgroup=true
 stopasgroup=true
 startsecs=0

playbooks/roles/xqwatcher/templates/edx/app/supervisor/conf.d/xqwatcher.conf.j2

@@ -13,8 +13,8 @@ command={{ executable }} -m {{ xqwatcher_module }} -d {{ xqwatcher_conf_dir }}
 process_name=%(program_name)s
 user={{ xqwatcher_user }}
 directory={{ xqwatcher_code_dir }}
-stdout_logfile={{ xqwatcher_supervisor_log_dir }}/%(program_name)-stdout.log
-stderr_logfile={{ xqwatcher_supervisor_log_dir }}/%(program_name)-stderr.log
+stdout_logfile={{ xqwatcher_supervisor_log_dir }}/%(program_name)s-stdout.log
+stderr_logfile={{ xqwatcher_supervisor_log_dir }}/%(program_name)s-stderr.log
 environment={% if COMMON_ENABLE_NEWRELIC_APP %}NEW_RELIC_APP_NAME={{ XQWATCHER_NEWRELIC_APPNAME }},NEW_RELIC_LICENSE_KEY={{ NEWRELIC_LICENSE_KEY }},{% endif -%}
 killasgroup=true
 stopasgroup=true

playbooks/roles/xserver/templates/xserver.conf.j2

@@ -7,7 +7,7 @@ directory={{ xserver_code_dir }}
 
 environment=PID=/var/tmp/xserver.pid,NEW_RELIC_CONFIG_FILE={{ xserver_app_dir }}/newrelic.ini,NEWRELIC={{ xserver_venv_dir }}/bin/newrelic-admin,PORT={{ xserver_gunicorn_port }},ADDRESS={{ xserver_gunicorn_host }},LANG={{ XSERVER_LANG }},DJANGO_SETTINGS_MODULE=xserver_aws_settings,SERVICE_VARIANT="xserver"
 
-stdout_logfile={{ supervisor_log_dir }}/%(program_name)-stdout.log
-stderr_logfile={{ supervisor_log_dir }}/%(program_name)-stderr.log
+stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
+stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log
 killasgroup=true
 stopasgroup=true

vagrant/release/devstack/Vagrantfile

@@ -75,6 +75,9 @@ openedx_releases = {
   "named-release/birch.rc3" => {
     :name => "birch-devstack-rc3", :file => "20150213-birch-devstack-rc3.box",
   },
+  "named-release/birch" => {
+    :name => "birch-devstack", :file => "20150224-birch-devstack.box",
+  },
 }
 openedx_releases.default = {
   :name => "lavash-devstack", :file => "20141118-lavash-devstack.box"

vagrant/release/fullstack/Vagrantfile

@@ -27,6 +27,9 @@ openedx_releases = {
   "named-release/birch.rc3" => {
     :name => "birch-fullstack-rc3", :file => "20150213-birch-fullstack-rc3.box"
   },
+  "named-release/birch" => {
+    :name => "birch-fullstack", :file => "20150224-birch-fullstack.box",
+  },
 }
 openedx_releases.default = {
   :name => "kifli-fullstack", :file => "20140826-kifli-fullstack.box"