From 66dc2df8c3b1ed1c94466581168976b42233f031 Mon Sep 17 00:00:00 2001 From: Luke Sneeringer Date: Tue, 30 Sep 2014 13:05:38 -0500 Subject: [PATCH] Make development settings honor conf.d --- awx/settings/development.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/awx/settings/development.py b/awx/settings/development.py index 5b88d30778..3e6c4f984f 100644 --- a/awx/settings/development.py +++ b/awx/settings/development.py @@ -46,7 +46,10 @@ if 'django_jenkins' in INSTALLED_APPS: os.path.join(BASE_DIR, 'ui/static/lib/ansible'),] # If there is an `/etc/tower/settings.py`, include it. +# If there is a `/etc/tower/conf.d/*.py`, include them. include(optional('/etc/tower/settings.py'), scope=locals()) +include(optional('/etc/tower/conf.d/*.py'), scope=locals()) + # If any local_*.py files are present in awx/settings/, use them to override # default settings for development. If not present, we can still run using