From 1ab7cd78373bd1756a10d2080fbc1d868c924023 Mon Sep 17 00:00:00 2001 From: Michael Krotscheck Date: Mon, 29 Feb 2016 13:36:57 -0800 Subject: [PATCH] Consolidate configuration default overrides This patch collects all methods that override oslo config default values into one. Change-Id: Ic049ea49481fbe94b4249d3cccdcbe2816d973ee --- keystone/common/config.py | 6 ++++++ keystone/server/common.py | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/keystone/common/config.py b/keystone/common/config.py index 73028b1529..56f419b6d1 100644 --- a/keystone/common/config.py +++ b/keystone/common/config.py @@ -1251,3 +1251,9 @@ def set_middleware_defaults(): 'DELETE', 'PATCH'] ) + + +def set_config_defaults(): + """Override all configuration default values for keystone.""" + set_default_for_default_log_levels() + set_middleware_defaults() diff --git a/keystone/server/common.py b/keystone/server/common.py index 7b56ab4331..4b1ee46941 100644 --- a/keystone/server/common.py +++ b/keystone/server/common.py @@ -30,8 +30,7 @@ def configure(version=None, config_files=None, pre_setup_logging_fn=lambda: None): config.configure() sql.initialize() - config.set_default_for_default_log_levels() - config.set_middleware_defaults() + config.set_config_defaults() CONF(project='keystone', version=version, default_config_files=config_files)