From 64e28ecba37914950cfbed46a5accfecb31955cd Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
Date: Wed, 22 Feb 2017 06:16:22 -0500
Subject: [PATCH] Stop reading local config dirs for domain-specific file
 config driver

When a file-config-based domain-specific backend was loaded the
local config files from /etc/keystone/keystone.conf.d/ were also read. The
local config dir should not be used in this case.

Change-Id: Ib576c8f12a7cc4272e07bb057bf028d69649b65d
Related-Bug: #1489118
(cherry picked from commit 5e8e71fb16e8bc94c169bbaa8aaf6a7527f816c0)
---
 keystone/identity/core.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/keystone/identity/core.py b/keystone/identity/core.py
index 2b9cea8f5e..c97b6a79b4 100644
--- a/keystone/identity/core.py
+++ b/keystone/identity/core.py
@@ -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