From 0796e1b633fb9bf6ff6a05e53a811f5bee307000 Mon Sep 17 00:00:00 2001 From: Dennis Kliban Date: Mon, 16 Dec 2024 16:10:17 -0500 Subject: [PATCH] Makes CONTENT_ORIGIN not a required setting --- pulpcore/app/checks.py | 14 -------------- pulpcore/app/settings.py | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/pulpcore/app/checks.py b/pulpcore/app/checks.py index a0129bf56b..74dc3d6cc7 100644 --- a/pulpcore/app/checks.py +++ b/pulpcore/app/checks.py @@ -4,20 +4,6 @@ from django.core.checks import Error as CheckError, Warning as CheckWarning, register -@register(deploy=True) -def content_origin_check(app_configs, **kwargs): - messages = [] - if getattr(settings, "CONTENT_ORIGIN", "UNREACHABLE") == "UNREACHABLE": - messages.append( - CheckError( - "CONTENT_ORIGIN is a required setting but it was not configured. This may be " - "caused by invalid read permissions of the settings file. Note that " - "CONTENT_ORIGIN is set by the installation automatically.", - id="pulpcore.E001", - ) - ) - return messages - @register(deploy=True) def secret_key_check(app_configs, **kwargs): diff --git a/pulpcore/app/settings.py b/pulpcore/app/settings.py index ac42609145..d198602b10 100644 --- a/pulpcore/app/settings.py +++ b/pulpcore/app/settings.py @@ -263,7 +263,7 @@ DRF_ACCESS_POLICY = {"reusable_conditions": ["pulpcore.app.global_access_conditions"]} # This is a sentinal value for deploy checks, since we don't want to set a default one. -CONTENT_ORIGIN = "UNREACHABLE" +CONTENT_ORIGIN = None CONTENT_PATH_PREFIX = "/pulp/content/" API_APP_TTL = 120 # The heartbeat is called from gunicorn notify (defaulting to 45 sec).