Merge pull request #344 from edx/e0d/doc-store-config-fix

This config needs to be a multiple levels for the moment :(

playbooks/roles/edxapp/defaults/main.yml

@@ -99,6 +99,13 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
     basic_auth: $EDXAPP_XQUEUE_BASIC_AUTH
     django_auth: $EDXAPP_XQUEUE_DJANGO_AUTH
     url: $EDXAPP_XQUEUE_URL
+  DOC_STORE_CONFIG: &edxapp_generic_default_docstore
+    db: $EDXAPP_MONGO_DB_NAME
+    host: $EDXAPP_MONGO_HOSTS
+    password: $EDXAPP_MONGO_PASSWORD
+    port: $EDXAPP_MONGO_PORT
+    user: $EDXAPP_MONGO_USER
+    collection:  'modulestore'
   CONTENTSTORE:
     ENGINE:  'xmodule.contentstore.mongo.MongoContentStore'
     #
@@ -111,12 +118,7 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
       password: $EDXAPP_MONGO_PASSWORD
       port: $EDXAPP_MONGO_PORT
       user: $EDXAPP_MONGO_USER
-    DOC_STORE_CONFIG:
-      db: $EDXAPP_MONGO_DB_NAME
-      host: $EDXAPP_MONGO_HOSTS
-      password: $EDXAPP_MONGO_PASSWORD
-      port: $EDXAPP_MONGO_PORT
-      user: $EDXAPP_MONGO_USER
+    DOC_STORE_CONFIG: *edxapp_generic_default_modulestore
   MODULESTORE:
     default: &edxapp_generic_default_modulestore
       ENGINE: 'xmodule.modulestore.mongo.DraftMongoModuleStore'
@@ -131,13 +133,7 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
         render_template:  'mitxmako.shortcuts.render_to_string'
         # Needed for the CMS to be able to run update_templates
         user: $EDXAPP_MONGO_USER
-      DOC_STORE_CONFIG: &edxapp_generic_default_docstore
-        db: $EDXAPP_MONGO_DB_NAME
-        host: $EDXAPP_MONGO_HOSTS
-        password: $EDXAPP_MONGO_PASSWORD
-        port: $EDXAPP_MONGO_PORT
-        user: $EDXAPP_MONGO_USER
-        collection:  'modulestore'
+      DOC_STORE_CONFIG: *edxapp_generic_default_docstore
     direct: &edxapp_generic_direct_modulestore
       ENGINE: 'xmodule.modulestore.mongo.MongoModuleStore'
       OPTIONS:  *generic_modulestore_default_options