Merge pull request #1331 from edx/release

Release

playbooks/roles/edxapp/defaults/main.yml

@@ -397,10 +397,6 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
         # Needed for the CMS to be able to run update_templates
         user: $EDXAPP_MONGO_USER
       DOC_STORE_CONFIG: *edxapp_generic_default_docstore
-    direct: &edxapp_generic_direct_modulestore
-      ENGINE: 'xmodule.modulestore.mongo.MongoModuleStore'
-      OPTIONS:  *generic_modulestore_default_options
-      DOC_STORE_CONFIG: *edxapp_generic_default_docstore
   DATABASES:
     read_replica:
       ENGINE: 'django.db.backends.mysql'
@@ -507,7 +503,7 @@ generic_env_config:  &edxapp_generic_env
   CAS_EXTRA_LOGIN_PARAMS: $EDXAPP_CAS_EXTRA_LOGIN_PARAMS
   CAS_ATTRIBUTE_CALLBACK: $EDXAPP_CAS_ATTRIBUTE_CALLBACK
   HOSTNAME_MODULESTORE_DEFAULT_MAPPINGS:
-    'preview\.': 'draft'
+    'preview\.': 'draft-preferred'
   UNIVERSITY_EMAIL: $EDXAPP_UNIVERSITY_EMAIL
   PRESS_EMAIL: $EDXAPP_PRESS_EMAIL
   PLATFORM_TWITTER_ACCOUNT: $EDXAPP_PLATFORM_TWITTER_ACCOUNT
@@ -549,11 +545,8 @@ lms_auth_config:
               password: $EDXAPP_MONGO_PASSWORD
               port: $EDXAPP_MONGO_PORT
               fs_root: $edxapp_course_data_dir
-            ENGINE: 'xmodule.modulestore.mongo.MongoModuleStore'
+            ENGINE: 'xmodule.modulestore.mongo.DraftMongoModuleStore'
             DOC_STORE_CONFIG: *edxapp_generic_default_docstore
-    draft:
-      <<: *edxapp_generic_default_modulestore
-      ENGINE: 'xmodule.modulestore.mongo.DraftMongoModuleStore'
 lms_env_config:
   <<: *edxapp_generic_env
   PAID_COURSE_REGISTRATION_CURRENCY: $EDXAPP_PAID_COURSE_REGISTRATION_CURRENCY