Merge "Stop reading local config dirs for domain-specific file config driver" into stable/ocata

This commit is contained in:
Jenkins 2017-07-20 17:42:26 +00:00 committed by Gerrit Code Review
commit fa76aa5f5d
1 changed files with 2 additions and 1 deletions

View File

@ -122,7 +122,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=file_list)
default_config_files=file_list,
default_config_dirs=[])
domain_config['driver'] = self._load_driver(domain_config)
_assert_no_more_than_one_sql_driver(domain_config, file_list)
self[domain_ref['id']] = domain_config