openstack
/
keystone
Code Issues Proposed changes

Stop reading local config dirs for domain-specific SQL config driver 

When an SQL-config-based domain-specific backend was loaded the
local config dir (/etc/keystone/keystone.conf.d) is also read. The
local config files should not be used in this case.

This is a followup fix for Idd095b2df375329f579c164d00dfd50b41b0e96d

Related-Bug: #1489118

Change-Id: I14008656a538ca7641aefffe08b9d1c23b7b87d2
(cherry picked from commit ab3bfaf90f)
This commit is contained in:
Dirk Mueller 2017-02-01 22:57:32 +01:00
parent defa49dcd3
commit 56f69b0477
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
keystone/identity/core.py
View File

@ -257,7 +257,8 @@ class DomainConfigs(dict):
domain_config['cfg'] = cfg.ConfigOpts()
keystone.conf.configure(conf=domain_config['cfg'])
domain_config['cfg'](args=[], project='keystone',
default_config_files=[])
default_config_files=[],
default_config_dirs=[])
# Override any options that have been passed in as specified in the
# database.