Commit a8403b69 by Max Rothman

Merge pull request #1824 from edx/max/reorder-edxapp-modulestore

Reorder edxapp modulestores
parents edd7f811 9b33c5d0
...@@ -512,6 +512,14 @@ edxapp_generic_auth_config: &edxapp_generic_auth ...@@ -512,6 +512,14 @@ edxapp_generic_auth_config: &edxapp_generic_auth
OPTIONS: OPTIONS:
mappings: "{{ EDXAPP_XML_MAPPINGS }}" mappings: "{{ EDXAPP_XML_MAPPINGS }}"
stores: stores:
- &edxapp_generic_split_modulestore
NAME: 'split'
ENGINE: 'xmodule.modulestore.split_mongo.split_draft.DraftVersioningModuleStore'
DOC_STORE_CONFIG: *edxapp_generic_default_docstore
OPTIONS:
default_class: 'xmodule.hidden_module.HiddenDescriptor'
fs_root: "{{ edxapp_course_data_dir }}"
render_template: 'edxmako.shortcuts.render_to_string'
- &edxapp_generic_draft_modulestore - &edxapp_generic_draft_modulestore
NAME: 'draft' NAME: 'draft'
ENGINE: 'xmodule.modulestore.mongo.DraftMongoModuleStore' ENGINE: 'xmodule.modulestore.mongo.DraftMongoModuleStore'
...@@ -526,14 +534,7 @@ edxapp_generic_auth_config: &edxapp_generic_auth ...@@ -526,14 +534,7 @@ edxapp_generic_auth_config: &edxapp_generic_auth
OPTIONS: OPTIONS:
data_dir: "{{ edxapp_course_data_dir }}" data_dir: "{{ edxapp_course_data_dir }}"
default_class: 'xmodule.hidden_module.HiddenDescriptor' default_class: 'xmodule.hidden_module.HiddenDescriptor'
- &edxapp_generic_split_modulestore
NAME: 'split'
ENGINE: 'xmodule.modulestore.split_mongo.split_draft.DraftVersioningModuleStore'
DOC_STORE_CONFIG: *edxapp_generic_default_docstore
OPTIONS:
default_class: 'xmodule.hidden_module.HiddenDescriptor'
fs_root: "{{ edxapp_course_data_dir }}"
render_template: 'edxmako.shortcuts.render_to_string'
DATABASES: DATABASES:
read_replica: read_replica:
ENGINE: 'django.db.backends.mysql' ENGINE: 'django.db.backends.mysql'
...@@ -711,10 +712,10 @@ cms_auth_config: ...@@ -711,10 +712,10 @@ cms_auth_config:
# mappings: "{{ EDXAPP_XML_MAPPINGS }}" # mappings: "{{ EDXAPP_XML_MAPPINGS }}"
mappings: {} mappings: {}
stores: stores:
- *edxapp_generic_split_modulestore
- *edxapp_generic_draft_modulestore - *edxapp_generic_draft_modulestore
# Commented for now so that it can be tested first: LMS-11258 # Commented for now so that it can be tested first: LMS-11258
# - *edxapp_generic_xml_modulestore # - *edxapp_generic_xml_modulestore
- *edxapp_generic_split_modulestore
cms_env_config: cms_env_config:
<<: *edxapp_generic_env <<: *edxapp_generic_env
SITE_NAME: "{{ EDXAPP_CMS_SITE_NAME }}" SITE_NAME: "{{ EDXAPP_CMS_SITE_NAME }}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment