openstack/keystonemiddleware
Code Issues Proposed changes

Merge "Use load_from_options_getter for auth plugins"

Browse Source
This commit is contained in:
Jenkins 2016-02-15 17:18:42 +00:00 committed by Gerrit Code Review
commit 2dedc1cc98
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
keystonemiddleware/auth_token/__init__.py
View File

@ -954,18 +954,10 @@ class AuthProtocol(BaseAuthProtocol):
self._identity_server.fetch_ca_cert()) self._identity_server.fetch_ca_cert())
def _get_auth_plugin(self): def _get_auth_plugin(self):
# NOTE(jamielennox): Ideally this would use get_from_conf_options # NOTE(jamielennox): Ideally this would use load_from_conf_options
# however that is not possible because we have to support the override # however that is not possible because we have to support the override
# pattern we use in _conf_get. There is a somewhat replacement for this # pattern we use in _conf_get. This function therefore does a manual
# in keystoneclient in load_from_options_getter which should be used # version of load_from_conf_options with the fallback plugin inline.
# when available. Until then this is essentially a copy and paste of
# the ksc load_from_conf_options code because we need to get a fix out
# for this quickly.
# FIXME(jamielennox): update to use load_from_options_getter when
# https://review.openstack.org/162529 merges.
# !!! - UNDER NO CIRCUMSTANCES COPY ANY OF THIS CODE - !!!
group = self._conf_get('auth_section') or _base.AUTHTOKEN_GROUP group = self._conf_get('auth_section') or _base.AUTHTOKEN_GROUP
@ -991,20 +983,16 @@ class AuthProtocol(BaseAuthProtocol):
group=group) group=group)
) )
# Plugin option registration is normally done as part of the load_from
# function rather than the register function so copy here.
plugin_loader = loading.get_plugin_loader(plugin_name) plugin_loader = loading.get_plugin_loader(plugin_name)
plugin_opts = [o._to_oslo_opt() for o in plugin_loader.get_options()] plugin_opts = loading.get_auth_plugin_conf_options(plugin_loader)
plugin_kwargs = dict()
(self._local_oslo_config or CONF).register_opts(plugin_opts, (self._local_oslo_config or CONF).register_opts(plugin_opts,
group=group) group=group)
for opt in plugin_opts: getter = lambda opt: self._conf_get(opt.dest, group=group)
val = self._conf_get(opt.dest, group=group) return plugin_loader.load_from_options_getter(getter)
if val is not None:
val = opt.type(val)
plugin_kwargs[opt.dest] = val
return plugin_loader.load_from_options(**plugin_kwargs)
def _determine_project(self): def _determine_project(self):
"""Determine a project name from all available config sources. """Determine a project name from all available config sources.