File tree Expand file tree Collapse file tree 2 files changed +13
-3
lines changed Expand file tree Collapse file tree 2 files changed +13
-3
lines changed Original file line number Diff line number Diff line change @@ -29,6 +29,7 @@ API_ROOT = {{ api_root | repr }}
29
29
{% if s 3_test | default (false ) %}
30
30
MEDIA_ROOT: ""
31
31
S3_USE_SIGV4 = True
32
+ {% if test_storages_compat_layer %}
32
33
STORAGES = {
33
34
"default": {
34
35
"BACKEND": "storages.backends.s3boto3.S3Boto3Storage",
@@ -47,10 +48,19 @@ STORAGES = {
47
48
"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage",
48
49
},
49
50
}
51
+ {% else %}
52
+ DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
53
+ AWS_ACCESS_KEY_ID = "{{ minio_access_key }}"
54
+ AWS_SECRET_ACCESS_KEY = "{{ minio_secret_key }}"
55
+ AWS_S3_REGION_NAME = "eu-central-1"
56
+ AWS_S3_ADDRESSING_STYLE = "path"
57
+ AWS_S3_SIGNATURE_VERSION = "s3v4"
58
+ AWS_STORAGE_BUCKET_NAME = "pulp3"
59
+ AWS_S3_ENDPOINT_URL = "http://minio:9000"
60
+ AWS_DEFAULT_ACL = "@none None"
61
+ {% endif %}
50
62
{% endif %}
51
63
52
- # This is using DEFAULT_FILE_STORAGE to test both usages.
53
- # Remove when DEFAULT_FILE_STORAGE is completely removed.
54
64
{% if azure_test | default (false ) %}
55
65
DEFAULT_FILE_STORAGE = "storages.backends.azure_storage.AzureStorage"
56
66
MEDIA_ROOT = ""
Original file line number Diff line number Diff line change 1
- 2021.08.26-417-gcec8e48
1
+ 2021.08.26-418-ge734462-dirty
You can’t perform that action at this time.
0 commit comments