Merge pull request #1533 from edx/jarv/xblock-storage

adding config for xblock storage

playbooks/roles/edxapp/defaults/main.yml

@@ -15,7 +15,9 @@
 # Variables set to "None" will be converted to None
 # when the edxapp config is written to disk.
 
-
+# Bucket used for xblock file storage
+EDXAPP_XBLOCK_FS_STORAGE_BUCKET: 'xblock-storage-bucket'
+EDXAPP_XBLOCK_FS_STORAGE_PREFIX: 'xblock-storage-bucket-dir/'
 EDXAPP_LMS_BASE: ""
 EDXAPP_PREVIEW_LMS_BASE: ""
 EDXAPP_CMS_BASE: ""
@@ -508,6 +510,12 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
   AWS_STORAGE_BUCKET_NAME: "{{ EDXAPP_AWS_STORAGE_BUCKET_NAME }}"
 
 generic_env_config:  &edxapp_generic_env
+  # TODO REMOVE the dashes version
+  # when https://github.com/edx/edx-platform/pull/5194/files is merged and released
+  XBLOCK-FS-STORAGE-BUCKET: $EDXAPP_XBLOCK_FS_STORAGE_BUCKET
+  XBLOCK-FS-STORAGE-PREFIX: $EDXAPP_XBLOCK_FS_STORAGE_PREFIX
+  XBLOCK_FS_STORAGE_BUCKET: $EDXAPP_XBLOCK_FS_STORAGE_BUCKET
+  XBLOCK_FS_STORAGE_PREFIX: $EDXAPP_XBLOCK_FS_STORAGE_PREFIX
   ANALYTICS_DATA_URL: $EDXAPP_ANALYTICS_DATA_URL
   CELERY_BROKER_VHOST: $EDXAPP_CELERY_BROKER_VHOST
   PAYMENT_SUPPORT_EMAIL: $EDXAPP_PAYMENT_SUPPORT_EMAIL