Merge pull request #1432 from edx/feanil/config_updates

Be able to override the modulestore mappings and storage bucket name.

playbooks/roles/edxapp/defaults/main.yml

@@ -100,6 +100,9 @@ EDXAPP_ENABLE_AUTO_AUTH: false
 EDXAPP_ENABLE_THIRD_PARTY_AUTH: false
 EDXAPP_THIRD_PARTY_AUTH: "None"
 
+EDXAPP_MODULESTORE_MAPPINGS:
+    'preview\.': 'draft-preferred'
+
 EDXAPP_FEATURES:
   AUTH_USE_OPENID_PROVIDER: true
   CERTIFICATES_ENABLED: true
@@ -253,10 +256,13 @@ EDXAPP_XML_S3_KEY: !!null
 EDXAPP_NEWRELIC_LMS_APPNAME: "{{COMMON_ENVIRONMENT}}-{{COMMON_DEPLOYMENT}}-edxapp-lms"
 EDXAPP_NEWRELIC_CMS_APPNAME: "{{COMMON_ENVIRONMENT}}-{{COMMON_DEPLOYMENT}}-edxapp-cms"
 
+EDXAPP_AWS_STORAGE_BUCKET_NAME: 'edxuploads'
+
 EDXAPP_ORA2_FILE_PREFIX: '{{COMMON_ENVIRONMENT}}-{{COMMON_DEPLOYMENT}}/ora2'
-EDXAPP_FILE_UPLOAD_STORAGE_BUCKET_NAME: 'edxuploads'
+EDXAPP_FILE_UPLOAD_STORAGE_BUCKET_NAME: '{{ EDXAPP_AWS_STORAGE_BUCKET_NAME }}'
 EDXAPP_FILE_UPLOAD_STORAGE_PREFIX: 'submissions_attachments'
 
+
 EDXAPP_CODE_JAIL_LIMITS:
   # Limit the memory of the jailed process to something high but not
   # infinite (128MiB in bytes)
@@ -458,6 +464,7 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
   CELERY_BROKER_PASSWORD: $EDXAPP_CELERY_PASSWORD
   GOOGLE_ANALYTICS_ACCOUNT: $EDXAPP_GOOGLE_ANALYTICS_ACCOUNT
   THIRD_PARTY_AUTH: $EDXAPP_THIRD_PARTY_AUTH
+  AWS_STORAGE_BUCKET_NAME: "{{ EDXAPP_AWS_STORAGE_BUCKET_NAME }}"
 
 generic_env_config:  &edxapp_generic_env
   ANALYTICS_DATA_URL: $EDXAPP_ANALYTICS_DATA_URL
@@ -538,8 +545,7 @@ generic_env_config:  &edxapp_generic_env
   CAS_SERVER_URL: $EDXAPP_CAS_SERVER_URL
   CAS_EXTRA_LOGIN_PARAMS: $EDXAPP_CAS_EXTRA_LOGIN_PARAMS
   CAS_ATTRIBUTE_CALLBACK: $EDXAPP_CAS_ATTRIBUTE_CALLBACK
-  HOSTNAME_MODULESTORE_DEFAULT_MAPPINGS:
-    'preview\.': 'draft-preferred'
+  HOSTNAME_MODULESTORE_DEFAULT_MAPPINGS: "{{ EDXAPP_MODULESTORE_MAPPINGS }}"
   UNIVERSITY_EMAIL: $EDXAPP_UNIVERSITY_EMAIL
   PRESS_EMAIL: $EDXAPP_PRESS_EMAIL
   PLATFORM_TWITTER_ACCOUNT: $EDXAPP_PLATFORM_TWITTER_ACCOUNT