Merge pull request #292 from edx/jarv/edxapp-mixedmodule

Jarv/edxapp mixedmodule

playbooks/roles/edxapp/handlers/main.yml

@@ -3,7 +3,6 @@
   service: name=edxapp state=started
   tags:
   - lms
-  - lms-xml
   - lms-preview
   - cms
   - deploy
@@ -12,7 +11,6 @@
   service: name=edxapp state=stopped
   tags:
   - lms
-  - lms-xml
   - lms-preview
   - cms
   - deploy
@@ -21,7 +19,6 @@
   service: name=edxapp state=restarted
   tags:
   - lms
-  - lms-xml
   - lms-preview
   - cms
   - deploy

playbooks/roles/edxapp/tasks/deploy.yml

@@ -4,7 +4,6 @@
   when: celery_worker is not defined
   tags:
   - lms
-  - lms-xml
   - lms-preview
   - cms
   - deploy
@@ -46,7 +45,6 @@
   when: edxapp_theme_name != ''
   tags:
   - cms
-  - lms-xml
   - lms-preview
   - lms
   - update
@@ -171,7 +169,6 @@
   tags:
   - lms
   - lms-preview
-  - lms-xml
   - deploy
 
 # Gather cms assets using rake if possible
@@ -198,7 +195,6 @@
   tags:
   - deploy
   - lms
-  - lms-xml
   - lms-preview
   - cms
   - syncdb
@@ -209,7 +205,6 @@
   tags:
   - deploy
   - lms
-  - lms-xml
   - lms-preview
   - cms
   - syncdb
@@ -220,7 +215,6 @@
   tags:
   - deploy
   - lms
-  - lms-xml
   - lms-preview
   - cms
   - migrate 
@@ -230,7 +224,6 @@
   when: celery_worker is not defined
   tags:
   - lms
-  - lms-xml
   - lms-preview
   - cms
   - deploy

playbooks/roles/edxapp/tasks/lms-xml.yml

-# requires:
-#  - group_vars/all
-#  - common/tasks/main.yml
-#  - nginx/tasks/main.yml
----
-- name: create lms-xml application config
-  template: src=lms-xml.env.json.j2 dest=$app_base_dir/lms-xml.env.json mode=640 owner=www-data group=adm
-  tags:
-  - lms-xml-env
-  - lmx-xml
-  - update
-
-- name: create lms-xml auth file
-  template: src=lms-xml.auth.json.j2 dest=$app_base_dir/lms-xml.auth.json mode=640 owner=www-data group=adm
-  tags:
-  - lms-xml-env
-  - lmx-xml
-  - update
-
-- name: Create lms-xml log target directory
-  file: path={{log_base_dir}}/lms-xml state=directory owner=syslog group=adm mode=2770
-  tags:
-  - lms-xml
-  - lms-xml-env
-  - logging
-  - update
-
-- include: ../../nginx/tasks/nginx_site.yml state=link site_name=lms-xml
-  when: celery_worker is not defined
-  
-- include: ../../nginx/tasks/nginx_site.yml state=link site_name=lms-xml-backend
-  when: celery_worker is not defined
-
-# Creates upstart file
-- include: upstart.yml basename=lms-xml
-  when: celery_worker is not defined
-
-- include: upstart.yml basename=edx-worker-lms-xml
-  when: celery_worker is defined

playbooks/roles/edxapp/tasks/main.yml

@@ -38,8 +38,6 @@
 
 - include: lms.yml
   when: "'lms' in service_variants_enabled"
-- include: lms-xml.yml
-  when: "'lms-xml' in service_variants_enabled"
 - include: cms.yml
   when: "'cms' in service_variants_enabled"
 - include: lms-preview.yml

playbooks/roles/edxapp/templates/edx-worker-lms-xml.conf.j2

-# gunicorn
-# Templated and placed by ansible from jinja2 source
-# lms-xml Celery Worker Upstart Script
-description "cms celery worker"
-
-stop on stopping edx-workers
-
-respawn
-
-instance edx.${SERVICE_VARIANT}.core.${QUEUE}
-
-#env NEW_RELIC_CONFIG_FILE=/opt/wwc/newrelic.ini
-#env NEWRELIC={{venv_dir}}/bin/newrelic-admin
-env CONCURRENCY=${CONCURRENCY}
-env LOGLEVEL=info
-env DJANGO_SETTINGS_MODULE={{worker_django_settings_module}}
-env PYTHONPATH={{edx_platform_code_dir}}
-env SERVICE_VARIANT=${SERVICE_VARIANT}
-
-setuid www-data
-
-chdir {{edx_platform_code_dir}}
-
-exec {{venv_dir}}/bin/python {{edx_platform_code_dir}}/manage.py lms --service-variant=$SERVICE_VARIANT --settings=$DJANGO_SETTINGS_MODULE celery worker --loglevel=$LOGLEVEL --queues=edx.${SERVICE_VARIANT}.core.${QUEUE} --hostname=edx.${SERVICE_VARIANT}.core.${QUEUE}.`hostname` --concurrency=$CONCURRENCY

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

@@ -20,10 +20,4 @@ pre-start script
    start edx-worker-lms QUEUE=high CONCURRENCY=4 SERVICE_VARIANT=lms
    {% endif %}
 
-   {% if 'lms-xml' in service_variants_enabled %}
-   start edx-worker-lms-xml QUEUE=low CONCURRENCY=1 SERVICE_VARIANT=lms-xml
-   start edx-worker-lms-xml QUEUE=default CONCURRENCY=3 SERVICE_VARIANT=lms-xml
-   start edx-worker-lms-xml QUEUE=high CONCURRENCY=4 SERVICE_VARIANT=lms-xml
-   {% endif %}
-
 end script

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

@@ -11,12 +11,6 @@ stop on runlevel [!2345]
 ##
 pre-start script
 
-{% if 'lms-xml' in service_variants_enabled %}
-if [ -e /etc/init/lms-xml.conf ]; then
-  start wait-for-state WAIT_FOR=lms-xml WAITER=$UPSTART_JOB
-fi
-{% endif %}
-
 {% if 'lms' in service_variants_enabled %}
 if [ -e /etc/init/lms.conf ]; then
   start wait-for-state WAIT_FOR=lms WAITER=$UPSTART_JOB
@@ -51,12 +45,6 @@ end script
 
 pre-stop script
 
-{% if 'lms-xml' in service_variants_enabled %}
-if [ -e /etc/init/lms-xml.conf ]; then
-  start wait-for-state WAIT_FOR=lms-xml WAITER=$UPSTART_JOB TARGET_GOAL="stop"
-fi
-{% endif %}
-
 {% if 'lms' in service_variants_enabled %}
 if [ -e /etc/init/lms.conf ]; then
   start wait-for-state WAIT_FOR=lms WAITER=$UPSTART_JOB TARGET_GOAL="stop"

playbooks/roles/edxapp/templates/lms-xml.auth.json.j2

-{{ lms_xml_auth_config | to_nice_json }}

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

-# gunicorn
-# Templated and placed by ansible from jinja2 source
-description "lms-xml gunicorn server"
-
-start on started edxapp
-stop on stopped edxapp
-
-respawn
-respawn limit 3 30
-
-env PID=/var/tmp/lms-xml.pid
-#env NEW_RELIC_CONFIG_FILE={{app_base_dir}}/newrelic.ini
-#env NEWRELIC={{venv_dir}}/bin/newrelic-admin
-{% if ansible_processor|length > 0 %}
-env WORKERS={{ ansible_processor|length * worker_core_mult.lms_xml }}
-{% else %}
-env WORKERS={{ worker_core_mult.lms_xml }}
-{% endif %}
-env PORT={{edxapp_lms_xml_app_port}}
-env ADDRESS={{edxapp_lms_xml_app_address}}
-env LANG=en_US.UTF-8
-env DJANGO_SETTINGS_MODULE=lms.envs.aws
-env SERVICE_VARIANT="lms-xml"
-
-chdir {{edx_platform_code_dir}}
-setuid www-data
-
-exec {{venv_dir}}/bin/gunicorn --preload -b $ADDRESS:$PORT -w $WORKERS --timeout=300 --pythonpath={{edx_platform_code_dir}}  lms.wsgi
-
-post-start script
-  while true
-  do
-    if $(curl -s -i localhost:$PORT/heartbeat | egrep -q '200 OK'); then
-      break;
-    else
-      sleep 1;
-    fi
-  done
-end script

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

-{{ lms_xml_env_config | to_nice_json }}

playbooks/roles/nginx/templates/lms-xml-backend.j2

-upstream lms-xml-backend {
-    # For a TCP configuration:
-    server 127.0.0.1:8030 fail_timeout=0;
-}
-

playbooks/roles/nginx/templates/lms-xml.j2

-server {
-  # LMS-preview configuration file for nginx, templated by ansible
-
-  listen {{lms_xml_nginx_port}};
-
-    # CS184 requires uploads of up to 4MB for submitting screenshots.
-  # CMS requires larger value for course assest, values provided
-  # via hiera.
-  client_max_body_size 4M;
-
-  rewrite ^(.*)/favicon.ico$ /static/images/favicon.ico last;
-
-  location @proxy_to_lms-preview_app {
-    proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
-    proxy_set_header X-Forwarded-Port $http_x_forwarded_port;
-    proxy_set_header X-Forwarded-For $http_x_forwarded_for;
-    proxy_set_header Host $http_host;
-
-    proxy_redirect off;
-    proxy_pass http://lms-xml-backend;
-  }
-
-  location @proxy_to_lms-xml_app {
-    proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
-    proxy_set_header X-Forwarded-Port $http_x_forwarded_port;
-    proxy_set_header X-Forwarded-For $http_x_forwarded_for;
-    proxy_set_header Host $http_host;
-
-    proxy_redirect off;
-    proxy_pass http://lms-xml-backend;
-  }
-
-  location / {
-    try_files $uri @proxy_to_lms-xml_app;
-  }
-
-  # No basic auth security on the github_service_hook url, so that github can use it for cms
-  location /github_service_hook {
-    try_files $uri @proxy_to_lms-xml_app;
-  }
-
-  # No basic auth security on the heartbeat url, so that ELB can use it
-  location /heartbeat {
-    try_files $uri @proxy_to_lms-xml_app;
-  }
-
-  # Check security on this
-  location ~ /static/(?P<file>.*) {
-    root {{app_base_dir}};
-    try_files /staticfiles/$file /course_static/$file =404;
-
-    # return a 403 for static files that shouldn't be
-    # in the staticfiles directory
-    location ~ ^/static/(?:.*)(?:\.xml|\.json|README.TXT) {
-        return 403;
-    }
-    # Set django-pipelined files to maximum cache time
-    location ~ "/static/(?P<collected>.*\.[0-9a-f]{12}\..*)" {
-        expires max;
-        # Without this try_files, files that have been run through
-        # django-pipeline return 404s
-        try_files /staticfiles/$collected /course_static/$collected =404;
-    }
-
-    # Expire other static files immediately (there should be very few / none of these)
-    expires epoch;
-  }
-
-  # Forward to HTTPS if we're an HTTP request...
-  if ($http_x_forwarded_proto = "http") {
-    set $do_redirect "true";
-  }
-
-  # Run our actual redirect...
-  if ($do_redirect = "true") {
-    rewrite ^ https://$host$request_uri? permanent;
-  }
-
-  # Monitoring support for datadog.
-  location /nginx_status {
-    stub_status on;
-    access_log off;
-    allow 127.0.0.1/32;
-    deny all;
-  }
-}

playbooks/roles/rabbitmq/defaults/main.yml

@@ -19,7 +19,6 @@ rabbitmq_ip: "{{ ansible_default_ipv4.address }}"
 # Vars meant to be overridden.
 RABBIT_ERLANG_COOKIE: 'DEFAULT_COOKIE'
 RABBIT_USERS:
-  admins:
   - name: 'admin'
     password: 'the example admin password'
   - name: 'edx'