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}