deleting references to lms-xml task and template files

playbooks/roles/edxapp/defaults/main.yml

@@ -73,6 +73,7 @@ EDXAPP_LOGGING_ENV:  'sandbox'
 
 EDXAPP_SYSLOG_SERVER: ''
 EDXAPP_RABBIT_HOSTNAME: 'rabbit.{{ENV_NAME}}.vpc.edx.org'
+EDXAPP_XML_MAPPINGS: {}
 
 #Use YAML references (& and *) and hash merge <<: to factor out shared settings
 #see http://atechie.net/2009/07/merging-hashes-in-yaml-conf-files/
@@ -182,8 +183,27 @@ lms_auth_config:
   <<: *edxapp_generic_auth
   MODULESTORE:
     default:
-      ENGINE: 'xmodule.modulestore.mongo.MongoModuleStore'
-      OPTIONS: *generic_modulestore_default_options
+      ENGINE: 'xmodule.modulestore.mixed.MixedModuleStore'
+      OPTIONS:
+        mappings: $EDXAPP_XML_MAPPINGS
+        stores:
+          xml:
+            ENGINE: 'xmodule.modulestore.xml.XMLModuleStore'
+            OPTIONS:
+              data_dir: '/opt/wwc/data'
+              default_class: 'xmodule.hidden_module.HiddenDescriptor'
+          default:
+            OPTIONS:
+              default_class: 'xmodule.hidden_module.HiddenDescriptor'
+              host: $EDXAPP_MONGO_HOSTS
+              db:  $EDXAPP_MONGO_DB_NAME
+              collection: 'modulestore'
+              render_template: 'mitxmako.shortcuts.render_to_string'
+              user: $EDXAPP_MONGO_USER
+              password:  $EDXAPP_MONGO_PASSWORD
+              port: 10016,
+              fs_root: '/opt/wwc/data'
+            ENGINE: 'xmodule.modulestore.mongo.MongoModuleStore'
 
 lms_env_config:
   <<: *edxapp_generic_env

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/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-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"