Merge pull request #17748 from open-craft/jill/swift_content_length_from_fd_master

Set SWIFT_CONTENT_LENGTH_FROM_FD=False

cms/envs/openstack.py

@@ -17,6 +17,8 @@ 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_LENGTH_FROM_FD = AUTH_TOKENS.get('SWIFT_CONTENT_LENGTH_FROM_FD', False)
+SWIFT_LAZY_CONNECT = AUTH_TOKENS.get('SWIFT_LAZY_CONNECT', True)
 
 if AUTH_TOKENS.get('SWIFT_REGION_NAME'):
     SWIFT_EXTRA_OPTIONS = {'region_name': AUTH_TOKENS['SWIFT_REGION_NAME']}

lms/envs/openstack.py

@@ -18,6 +18,7 @@ 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)
+SWIFT_CONTENT_LENGTH_FROM_FD = AUTH_TOKENS.get('SWIFT_CONTENT_LENGTH_FROM_FD', False)
 SWIFT_LAZY_CONNECT = AUTH_TOKENS.get('SWIFT_LAZY_CONNECT', True)
 
 if AUTH_TOKENS.get('SWIFT_REGION_NAME'):

requirements/edx/openstack.txt

@@ -3,4 +3,4 @@
 #
 
 # OpenStack swift backend for django storage API
-django-storage-swift==1.2.18
+django-storage-swift==1.2.19