Skip to content

Commit e0716c0

Browse files
committed
Update CI files
1 parent d588a23 commit e0716c0

File tree

1 file changed

+10
-21
lines changed

1 file changed

+10
-21
lines changed

.ci/ansible/settings.py.j2

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,30 +27,19 @@ API_ROOT = {{ api_root | repr }}
2727
{% endif %}
2828

2929
{% if s3_test | default(false) %}
30-
MEDIA_ROOT: ""
30+
DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
31+
MEDIA_ROOT = ""
32+
AWS_ACCESS_KEY_ID = "{{ minio_access_key }}"
33+
AWS_SECRET_ACCESS_KEY = "{{ minio_secret_key }}"
34+
AWS_S3_REGION_NAME = "eu-central-1"
35+
AWS_S3_ADDRESSING_STYLE = "path"
3136
S3_USE_SIGV4 = True
32-
STORAGES = {
33-
"default": {
34-
"BACKEND": "storages.backends.s3boto3.S3Boto3Storage",
35-
"OPTIONS": {
36-
"access_key": "{{ minio_access_key }}",
37-
"secret_key": "{{ minio_secret_key }}",
38-
"region_name": "eu-central-1",
39-
"addressing_style": "path",
40-
"signature_version": "s3v4",
41-
"bucket_name": "pulp3",
42-
"endpoint_url": "http://minio:9000",
43-
"default_acl": "@none None",
44-
},
45-
},
46-
"staticfiles": {
47-
"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage",
48-
},
49-
}
37+
AWS_S3_SIGNATURE_VERSION = "s3v4"
38+
AWS_STORAGE_BUCKET_NAME = "pulp3"
39+
AWS_S3_ENDPOINT_URL = "http://minio:9000"
40+
AWS_DEFAULT_ACL = "@none None"
5041
{% endif %}
5142

52-
# This is using DEFAULT_FILE_STORAGE to test both usages.
53-
# Remove when DEFAULT_FILE_STORAGE is completely removed.
5443
{% if azure_test | default(false) %}
5544
DEFAULT_FILE_STORAGE = "storages.backends.azure_storage.AzureStorage"
5645
MEDIA_ROOT = ""

0 commit comments

Comments
 (0)