Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ if [ "$TEST" = "s3" ]; then
sed -i -e '$a s3_test: true\
minio_access_key: "'$MINIO_ACCESS_KEY'"\
minio_secret_key: "'$MINIO_SECRET_KEY'"\
pulp_scenario_settings: {"MEDIA_ROOT": "", "STORAGES": {"default": {"BACKEND": "storages.backends.s3boto3.S3Boto3Storage", "OPTIONS": {"access_key": "AKIAIT2Z5TDYPX3ARJBA", "addressing_style": "path", "bucket_name": "pulp3", "default_acl": "@none", "endpoint_url": "http://minio:9000", "region_name": "eu-central-1", "secret_key": "fqRvjWaPU5o0fCqQuUWbj9Fainj2pVZtBCiDiieS", "signature_version": "s3v4"}}, "staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}}, "domain_enabled": true, "flatpak_index": false, "token_auth_disabled": true}\
pulp_scenario_settings: {"MEDIA_ROOT": "", "STORAGES": {"default": {"BACKEND": "storages.backends.s3boto3.S3Boto3Storage", "OPTIONS": {"access_key": "AKIAIT2Z5TDYPX3ARJBA", "addressing_style": "path", "bucket_name": "pulp3", "default_acl": "@none", "endpoint_url": "http://minio:9000", "region_name": "eu-central-1", "secret_key": "fqRvjWaPU5o0fCqQuUWbj9Fainj2pVZtBCiDiieS", "signature_version": "s3v4"}}, "staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}}, "domain_enabled": true, "enabled_plugins": ["pulp_file", "pulp_container"], "flatpak_index": false, "token_auth_disabled": true}\
pulp_scenario_env: {}\
' vars/main.yaml
export PULP_API_ROOT="/rerouted/djnd/"
Expand Down
1 change: 1 addition & 0 deletions CHANGES/2044.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Added a deployment check to produce a better error message when pulp_file missing from `ENABLED_PLUGINS`.
9 changes: 9 additions & 0 deletions pulp_container/app/dynaconf_hooks.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
from dynaconf import ValidationError


def post(settings):
data = {"dynaconf_merge": True}
enabled_plugins = settings.get("ENABLED_PLUGINS")
if enabled_plugins and "pulp_file" not in enabled_plugins:
raise ValidationError("pulp_file must be enabled to use pulp_container")
return data
3 changes: 3 additions & 0 deletions template_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ pulp_settings_s3:
staticfiles:
BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage
domain_enabled: true
enabled_plugins:
- pulp_file
- pulp_container
flatpak_index: false
token_auth_disabled: true
pydocstyle: true
Expand Down
Loading