Re-add dab to installed apps by default.

No-Issue Signed-off-by: James Tanner <[email protected]>
ansible · Jun 10, 2024 · eb18e03 · eb18e03
1 parent c1cc1b0
commit eb18e03
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/dev/oci_env_integration/oci_env_configs/community.compose.env b/dev/oci_env_integration/oci_env_configs/community.compose.env
@@ -1,7 +1,7 @@
 COMPOSE_PROFILE=galaxy_ng/base:galaxy_ng/community:pminio
 COMPOSE_PROJECT_NAME=ci-community
 
-DEV_SOURCE_PATH=galaxy_ng
+DEV_SOURCE_PATH=galaxy_ng:django-ansible-base
 COMPOSE_BINARY=docker
 SETUP_TEST_DATA=1
 UPDATE_UI=0

diff --git a/galaxy_ng/app/dynaconf_hooks.py b/galaxy_ng/app/dynaconf_hooks.py
@@ -64,12 +64,11 @@ def configure_dab_resource_registry(settings: Dynaconf) -> Dict[str, Any]:
 
     data = {}
     if flags["dab_resource_registry"]:
-        data["INSTALLED_APPS"] = ['ansible_base.resource_registry', 'dynaconf_merge']
         data["ANSIBLE_BASE_RESOURCE_CONFIG_MODULE"] = "galaxy_ng.app.api.resource_api"
 
         # this always needs social_django installed ...
         if "social_django" not in settings.INSTALLED_APPS:
-            data["INSTALLED_APPS"].append("social_django")
+            data["INSTALLED_APPS"] = ["social_django"]
 
     return data
 

diff --git a/galaxy_ng/app/settings.py b/galaxy_ng/app/settings.py
@@ -25,6 +25,7 @@
     'rest_framework.authtoken',
     'crum',
     'dynaconf_merge',
+    'ansible_base.resource_registry',
 ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,7 @@ @@
         'rest_framework.authtoken',
         'crum',
         'dynaconf_merge',
+        'ansible_base.resource_registry',
     ]
@@ Expand Down @@