From dd7a7744235da123a205a671bdd8c32509e1474f Mon Sep 17 00:00:00 2001 From: Dolph Mathews Date: Fri, 24 Jun 2016 00:59:11 +0000 Subject: [PATCH] Replace keystone.common.config with keystone.conf package keystone.common.config is 1200+ lines of super dense, merge-conflict prone, difficult to navigate, and finicky to maintain code. Let's follow nova's lead and break it down into more manageable modules. This patch creates a new Python package, keystone.conf, and moves all of our configuration options into it, mirroring nova's nova.conf package. There are a couple special modules in keystone.conf introduced here as well: - keystone.conf.__init__: This causes all of Keystone options to be registered on import, so consumers of keystone.conf don't have races with config initialization code while trying to use oslo_config.cfg.CONF directly (keystone.conf replaces all uses for oslo_config.cfg.CONF in keystone). - keystone.conf.base: Keystone's [DEFAULT] group options. I'd prefer this to be called 'default.py', but I'm just copying nova's lead here. - keystone.conf.opts: The entry point for oslo.config itself. - keystone.conf.constants: There are a few constants (deprecation messages, default paths, etc) that are used by multiple configuration modules, so they need to live in a common place. Change-Id: Ia3daffe3fef111b42de203762e966cd14d8927e2 --- keystone_tempest_plugin/config.py | 1 - 1 file changed, 1 deletion(-) diff --git a/keystone_tempest_plugin/config.py b/keystone_tempest_plugin/config.py index aaebcfb..79cbad3 100644 --- a/keystone_tempest_plugin/config.py +++ b/keystone_tempest_plugin/config.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. - from oslo_config import cfg