openstack/placement
Code Issues Proposed changes

Merge "Use ksa adapter for keystone conf & requests"

Browse Source
This commit is contained in:
Zuul 2017-12-05 10:29:18 +00:00 committed by Gerrit Code Review
commit fa17a2d949
1 changed files with 9 additions and 3 deletions

12
nova/conf/keystone.py

@ -14,6 +14,10 @@
from keystoneauth1 import loading as ks_loading
from oslo_config import cfg
from nova.conf import utils as confutils
DEFAULT_SERVICE_TYPE = 'identity'
keystone_group = cfg.OptGroup(
'keystone',
@ -23,12 +27,14 @@ keystone_group = cfg.OptGroup(
def register_opts(conf):
conf.register_group(keystone_group)
ks_loading.register_session_conf_options(conf, keystone_group.name)
confutils.register_ksa_opts(conf, keystone_group.name,
DEFAULT_SERVICE_TYPE, include_auth=False)
def list_opts():
return {
keystone_group: (
ks_loading.get_session_conf_options())
ks_loading.get_session_conf_options() +
confutils.get_ksa_adapter_opts(DEFAULT_SERVICE_TYPE)
)
}