diff options
| author | Gary W. Smith <gary.w.smith@hp.com> | 2014-06-12 17:00:19 -0700 |
|---|---|---|
| committer | Gary W. Smith <gary.w.smith@hp.com> | 2014-06-16 15:42:18 -0700 |
| commit | 1f38f871387e58766f3c19aadacdb804163f316c (patch) | |
| tree | e7718cb4892989bd2a5c55c25a17f3726bfe471e /doc/source/conf.py | |
| parent | d329ded5acdee67c5d8984a21502d660191345e9 (diff) | |
| download | horizon-1f38f871387e58766f3c19aadacdb804163f316c.tar.gz | |
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
Diffstat (limited to 'doc/source/conf.py')
| -rw-r--r-- | doc/source/conf.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 |