From 5143fb88567276f85160b9610d4ae146efea27fd Mon Sep 17 00:00:00 2001 From: Chris Dent Date: Wed, 5 Sep 2018 19:03:08 +0100 Subject: [PATCH] de-novify wsgi application to expect placement config Replace references of 'nova' to 'placement' so that the wsgi application loads up the right config and uses the right conf options. We don't currently have tests for this (because we have no dsvm-associated jobs) but this has been successfully used in a hacked up local devstack. This patch will be included as part of a Depends-On stack that tests those devstack hacks. Change-Id: Ibed4c64fa4e74c830d0d2fa040089bf9dc7b8f29 --- placement/wsgi.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/placement/wsgi.py b/placement/wsgi.py index ade858bff..76787cbd0 100644 --- a/placement/wsgi.py +++ b/placement/wsgi.py @@ -32,10 +32,11 @@ from placement import deploy profiler = importutils.try_import('osprofiler.opts') -CONFIG_FILE = 'nova.conf' +CONFIG_FILE = 'placement.conf' -version_info = pbr.version.VersionInfo('nova') +# The distribution name is required here, not package. +version_info = pbr.version.VersionInfo('openstack-placement') def setup_logging(config): @@ -46,7 +47,7 @@ def setup_logging(config): ] logging.set_defaults(default_log_levels=logging.get_default_log_levels() + extra_log_level_defaults) - logging.setup(config, 'nova') + logging.setup(config, 'placement') py_logging.captureWarnings(True) @@ -54,7 +55,7 @@ def _get_config_file(env=None): if env is None: env = os.environ - dirname = env.get('OS_PLACEMENT_CONFIG_DIR', '/etc/nova').strip() + dirname = env.get('OS_PLACEMENT_CONFIG_DIR', '/etc/placement').strip() return os.path.join(dirname, CONFIG_FILE) @@ -70,7 +71,8 @@ def _parse_args(argv, default_config_files): # deploy module. policy_opts.set_defaults(conf.CONF) - conf.CONF(argv[1:], project='nova', version=version_info.version_string(), + conf.CONF(argv[1:], project='placement', + version=version_info.version_string(), default_config_files=default_config_files)