From 1f38f871387e58766f3c19aadacdb804163f316c Mon Sep 17 00:00:00 2001 From: "Gary W. Smith" Date: Thu, 12 Jun 2014 17:00:19 -0700 Subject: Fix keystone warnings while building docs When building the documentation via run_tests.sh, doc/source/conf.py explicitly sets the DJANGO_SETTINGS_MODULE environment variable, overriding any existing value that it already has. Furthermore, it sets it to point to a settings file that does not use keystone v3, which is expected by the tests (and is the source of the warning). Note that when running unit tests via run_tests.sh, a different settings file is supplied which DOES use keystone v3. Change the doc/source/conf.py to only set DJANGO_SETTINGS_MODULE if it is not already set. Change tox.ini and run_tests.sh to set DJANGO_SETTINGS_MODULE to the same settings file used by the unit tests, with keystone v3 support. Change-Id: Ib297e4188f2426cf575300998bc9d50f36e48f4f Closes-Bug: #1257725 --- doc/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/source/conf.py') diff --git a/doc/source/conf.py b/doc/source/conf.py index c15879626..2961a7d3f 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -33,7 +33,7 @@ ROOT = os.path.abspath(os.path.join(BASE_DIR, "..", "..")) sys.path.insert(0, ROOT) # This is required for ReadTheDocs.org, but isn't a bad idea anyway. -os.environ['DJANGO_SETTINGS_MODULE'] = 'openstack_dashboard.settings' +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'openstack_dashboard.settings') import horizon.version -- cgit v1.2.1