From 0fcdcb02bb7027ae04fd349db2b6ddd398b04931 Mon Sep 17 00:00:00 2001 From: Jillian Vogel Date: Sat, 1 Jul 2017 14:04:22 +0930 Subject: [PATCH] Use ORA2 django storage on openstack and devstack. Default ORA2 storage settings use AWS, so no change required to aws envs. --- lms/envs/devstack.py | 1 + lms/envs/openstack.py | 3 +++ lms/urls.py | 6 ++++++ requirements/edx/github.txt | 2 +- 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py index c2ebb0ea57..909259f278 100644 --- a/lms/envs/devstack.py +++ b/lms/envs/devstack.py @@ -8,6 +8,7 @@ from .aws import * # pylint: disable=wildcard-import, unused-wildcard-import # Don't use S3 in devstack, fall back to filesystem del DEFAULT_FILE_STORAGE MEDIA_ROOT = "/edx/var/edxapp/uploads" +ORA2_FILEUPLOAD_BACKEND = 'django' DEBUG = True diff --git a/lms/envs/openstack.py b/lms/envs/openstack.py index 27eee43b4b..c8f99f45f1 100644 --- a/lms/envs/openstack.py +++ b/lms/envs/openstack.py @@ -17,6 +17,7 @@ SWIFT_NAME_PREFIX = FILE_UPLOAD_STORAGE_PREFIX SWIFT_USE_TEMP_URLS = AUTH_TOKENS.get('SWIFT_USE_TEMP_URLS', False) SWIFT_TEMP_URL_KEY = AUTH_TOKENS.get('SWIFT_TEMP_URL_KEY') SWIFT_TEMP_URL_DURATION = AUTH_TOKENS.get('SWIFT_TEMP_URL_DURATION', 1800) # seconds +SWIFT_CONTENT_TYPE_FROM_FD = AUTH_TOKENS.get('SWIFT_CONTENT_TYPE_FROM_FD', True) if AUTH_TOKENS.get('SWIFT_REGION_NAME'): SWIFT_EXTRA_OPTIONS = {'region_name': AUTH_TOKENS['SWIFT_REGION_NAME']} @@ -27,3 +28,5 @@ elif SWIFT_AUTH_URL and SWIFT_USERNAME and SWIFT_KEY: DEFAULT_FILE_STORAGE = 'swift.storage.SwiftStorage' else: DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage' + +ORA2_FILEUPLOAD_BACKEND = "django" diff --git a/lms/urls.py b/lms/urls.py index d0a41858a2..3fb0ea373c 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -19,6 +19,7 @@ from openedx.core.djangoapps.self_paced.models import SelfPacedConfiguration from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers from openedx.features.enterprise_support.api import enterprise_enabled + # Uncomment the next two lines to enable the admin: if settings.DEBUG or settings.FEATURES.get('ENABLE_DJANGO_ADMIN_SITE'): admin.autodiscover() @@ -146,6 +147,11 @@ js_info_dict = { 'packages': ('openassessment',), } +urlpatterns += ( + url(r'^openassessment/fileupload/', include('openassessment.fileupload.urls')), +) + + # sysadmin dashboard, to see what courses are loaded, to delete & load courses if settings.FEATURES["ENABLE_SYSADMIN_DASHBOARD"]: urlpatterns += ( diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index cecb77b90a..ad2e495a22 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -74,7 +74,7 @@ git+https://github.com/edx/lettuce.git@0.2.20.002#egg=lettuce==0.2.20.002 -e git+https://github.com/edx/event-tracking.git@0.2.1#egg=event-tracking==0.2.1 -e git+https://github.com/edx/django-splash.git@v0.2#egg=django-splash==0.2 -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock -git+https://github.com/edx/edx-ora2.git@1.4.4#egg=ora2==1.4.4 +git+https://github.com/edx/edx-ora2.git@1.4.6#egg=ora2==1.4.6 -e git+https://github.com/edx/edx-submissions.git@2.0.0#egg=edx-submissions==2.0.0 git+https://github.com/edx/ease.git@release-2015-07-14#egg=ease==0.1.3 git+https://github.com/edx/edx-val.git@0.0.17#egg=edxval==0.0.17