From b5162f731b4a5e5c080ac0d5796785ea681a5f1d Mon Sep 17 00:00:00 2001 From: Chris Dent Date: Wed, 21 Nov 2018 16:13:46 +0000 Subject: [PATCH] Remove keystoneauth1 opts from placement config group The keystoneauth1 opts were included in the [placement] config group in nova to define how nova was supposed to talk to the placement service that it discovered in its service catalog. Placement doesn't need to talk to itself, and for the time being it doesn't need to talk to anyone else but the database, so we can remove the settings. We do not need to deprecate them because we have already declared that a "fresh config" is required and we haven't had a release yet. If people have the settings in their config files they simply won't be used. Similar settings are registered in the [keystone] group which will be cleaned up in a separate change (note that the [keystone] group is not the same as the [keystone_authtoken] group which is used by the authtoken API middleware). There's no test coverage for these because any tests which would have used them are still in nova. Integration tests will make sure this change is fine. Change-Id: I180a4df89d8338dc640dc2c5638775c65bde1cb7 --- placement/conf/placement.py | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/placement/conf/placement.py b/placement/conf/placement.py index cd04b6baf..44580ce8c 100644 --- a/placement/conf/placement.py +++ b/placement/conf/placement.py @@ -11,13 +11,9 @@ # under the License. from __future__ import absolute_import -from keystoneauth1 import loading as ks_loading from oslo_config import cfg -from placement.conf import utils as confutils - -DEFAULT_SERVICE_TYPE = 'placement' DEFAULT_CONSUMER_MISSING_ID = '00000000-0000-0000-0000-000000000000' placement_group = cfg.OptGroup( @@ -85,17 +81,7 @@ def register_opts(conf): conf.register_group(placement_group) conf.register_opts(placement_opts, group=placement_group) conf.register_opts(service_opts) - confutils.register_ksa_opts(conf, placement_group, DEFAULT_SERVICE_TYPE) def list_opts(): - return { - placement_group.name: ( - placement_opts + - ks_loading.get_session_conf_options() + - ks_loading.get_auth_common_conf_options() + - ks_loading.get_auth_plugin_conf_options('password') + - ks_loading.get_auth_plugin_conf_options('v2password') + - ks_loading.get_auth_plugin_conf_options('v3password') + - confutils.get_ksa_adapter_opts(DEFAULT_SERVICE_TYPE)) - } + return {placement_group.name: placement_opts}