Skip to content

Commit 9e72bb2

Browse files
committed
Apply plugin template
1 parent 2b8db68 commit 9e72bb2

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

.ci/ansible/settings.py.j2

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ API_ROOT = {{ api_root | repr }}
2929
{% if s3_test | default(false) %}
3030
MEDIA_ROOT: ""
3131
S3_USE_SIGV4 = True
32+
{% if test_storages_compat_layer %}
3233
STORAGES = {
3334
"default": {
3435
"BACKEND": "storages.backends.s3boto3.S3Boto3Storage",
@@ -47,10 +48,19 @@ STORAGES = {
4748
"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage",
4849
},
4950
}
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 %}
5062
{% endif %}
5163

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

.github/template_gitref

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2021.08.26-417-gcec8e48
1+
2021.08.26-418-ge734462-dirty

0 commit comments

Comments
 (0)