openstack
/
neutron
Code Issues Proposed changes

Return oslo_config Opts to config generator 

We shouldn't be returning keystoneauth Opts to the oslo_config
generator. Whilst it mostly works these objects are not interchangable
and it can result in problems. You can see this by entries such as:

  # Warning: Failed to format sample for tenant_name
  # isinstance() arg 2 must be a class, type, or tuple of classes
    and types

in the currently generated config files.

Keystoneauth provides a function that returns oslo_config options so
fetch, process and return those instead.

Change-Id: Ie3fad2381467b19189cbb332c41cea8b6cf6e264
Closes-Bug: #1548433 
(cherry picked from commit c3db0707ef)
This commit is contained in:
Jamie Lennox 2016-03-15 10:05:29 +11:00 committed by Ihar Hrachyshka
parent 33c01f4d49
commit 9679285f54
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/opts.py
View File

@ -295,7 +295,7 @@ def list_auth_opts():
# the config options for a few common ones
plugins = ['password', 'v2password', 'v3password']
for name in plugins:
for plugin_option in ks_loading.get_plugin_loader(name).get_options():
for plugin_option in ks_loading.get_auth_plugin_conf_options(name):
if all(option.name != plugin_option.name for option in opt_list):
opt_list.append(plugin_option)
opt_list.sort(key=operator.attrgetter('name'))