-
Notifications
You must be signed in to change notification settings - Fork 115
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[experiment] #6202
[experiment] #6202
Conversation
.ci/ansible/settings.py.j2
Outdated
{% if STORAGES in pulp_scenario_settings %} | ||
STORAGES = {{ pulp_scenario_settings["STORAGES"] }} | ||
{% else %} | ||
DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage" | ||
AWS_ACCESS_KEY_ID = "{{ minio_access_key }}" | ||
AWS_SECRET_ACCESS_KEY = "{{ minio_secret_key }}" | ||
AWS_S3_REGION_NAME = "eu-central-1" | ||
AWS_S3_ADDRESSING_STYLE = "path" | ||
AWS_S3_SIGNATURE_VERSION = "s3v4" | ||
AWS_STORAGE_BUCKET_NAME = "pulp3" | ||
AWS_S3_ENDPOINT_URL = "http://minio:9000" | ||
AWS_DEFAULT_ACL = "@none None" | ||
{% endif %} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ohhhh. This file is not templated by the template but by the CI.
I think what you can do is fall back to writing the if
in python.
And we need to tackle making all of this simpler soon.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Forget that, I think you just forgot to quote "STORAGES"...
dd9f312
to
63bc396
Compare
63bc396
to
65a595a
Compare
Looks like this is worked (here the final settings).
I'm actually a bit surprised that the minio variable interpolation worked, since the code with the curly braces was itself injected through templating. |
template_config.yml
Outdated
"endpoint_url": "http://minio:9000" | ||
"default_acl": "@none None" | ||
"staticfiles": | ||
"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mdellweg the storage settings were provided by the template and now they would be provided per-plugin.
Maybe we should just add a flag to whether to use or not the new form and leave the fallback in plugin-template?
d93848c
to
228fe56
Compare
Are you saying we now use the literal string "{{ minio_access_key }}" as the key? I agree, a new flag just once again could be the easier solution here. |
No, I'm saying I expected it to yield the literal, but it didnt. Anyway, I'm going with the YAPTF (yet another plugin template flag). |
Thank you. That's definitely better than a solution we don't understand. |
9e72bb2
to
b6993f6
Compare
No description provided.