openstack
/
keystone
Code Issues Proposed changes

Merge "Fix config path for running wsgi in developer mode"

This commit is contained in:
Jenkins 2016-05-20 23:46:09 +00:00 committed by Gerrit Code Review
parent 3afbf86b56 80d7bee46d
commit 83ae561b07
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
keystone/server/wsgi.py
View File

@ -39,8 +39,19 @@ CONF = cfg.CONF
def initialize_application(name,
post_log_configured_function=lambda: None,
config_files=None):
possible_topdir = os.path.normpath(os.path.join(
os.path.abspath(__file__),
os.pardir,
os.pardir,
os.pardir))
dev_conf = os.path.join(possible_topdir,
'etc',
'keystone.conf')
if not config_files:
config_files = None
if os.path.exists(dev_conf):
config_files = [dev_conf]
common.configure(config_files=config_files)