openstack
/
placement
Code Issues Proposed changes

Merge "Remove keystoneauth1 opts from placement config group"

This commit is contained in:
Zuul 2018-11-28 02:56:02 +00:00 committed by Gerrit Code Review
parent 79048a3972 b5162f731b
commit 685b3eff43
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
placement/conf/placement.py
View File

@ -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}