diff options
| author | Jamie Lennox <jamielennox@redhat.com> | 2014-08-12 07:38:16 +1000 |
|---|---|---|
| committer | Jamie Lennox <jamielennox@redhat.com> | 2014-08-13 07:19:08 +0000 |
| commit | feaafdc651bf967b6d181cc384bf583152246956 (patch) | |
| tree | 99be22f9c43ec38c633ac2b8469d522533a294e5 /keystoneclient/auth/conf.py | |
| parent | 8f1605e30a0a563f5a9018b80c73aaabf6f5228d (diff) | |
| download | python-keystoneclient-feaafdc651bf967b6d181cc384bf583152246956.tar.gz | |
Allow registering individual plugin CONF options
Give plugins some more flexibility in registering there own CONF
options.
Change-Id: Id6d47e59e96b7b42c04cecdd53c13a887f60c75b
Diffstat (limited to 'keystoneclient/auth/conf.py')
| -rw-r--r-- | keystoneclient/auth/conf.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/keystoneclient/auth/conf.py b/keystoneclient/auth/conf.py index b14627e..c3d13db 100644 --- a/keystoneclient/auth/conf.py +++ b/keystoneclient/auth/conf.py @@ -104,13 +104,5 @@ def load_from_conf_options(conf, group, **kwargs): raise exceptions.NoMatchingPlugin('No plugin name provided for config') plugin_class = base.get_plugin_class(name) - plugin_opts = plugin_class.get_options() - conf.register_opts(plugin_opts, group=group) - - for opt in plugin_opts: - val = conf[group][opt.dest] - if val is not None: - val = opt.type(val) - kwargs.setdefault(opt.dest, val) - - return plugin_class.load_from_options(**kwargs) + plugin_class.register_conf_options(conf, group) + return plugin_class.load_from_conf_options(conf, group, **kwargs) |