openstack/manila
Code Issues Proposed changes

Merge "Fix sample config generation for cinder, nova and neutron opts"

Browse Source
This commit is contained in:
Jenkins 2016-08-17 00:04:48 +00:00 committed by Gerrit Code Review
commit bb767e8ece
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manila/opts.py
View File

@ -94,13 +94,11 @@ _global_opt_lists = [
manila.common.config.debug_opts, manila.common.config.debug_opts,
manila.common.config.global_opts, manila.common.config.global_opts,
manila.compute._compute_opts, manila.compute._compute_opts,
manila.compute.nova.nova_opts,
manila.db.api.db_opts, manila.db.api.db_opts,
[manila.db.base.db_driver_opt], [manila.db.base.db_driver_opt],
manila.exception.exc_log_opts, manila.exception.exc_log_opts,
manila.network.linux.interface.OPTS, manila.network.linux.interface.OPTS,
manila.network.network_opts, manila.network.network_opts,
manila.network.neutron.api.neutron_opts,
manila.network.neutron.neutron_network_plugin. manila.network.neutron.neutron_network_plugin.
neutron_network_plugin_opts, neutron_network_plugin_opts,
manila.network.neutron.neutron_network_plugin. manila.network.neutron.neutron_network_plugin.
@ -157,13 +155,18 @@ _global_opt_lists = [
manila.share.hook.hook_options, manila.share.hook.hook_options,
manila.share.manager.share_manager_opts, manila.share.manager.share_manager_opts,
manila.volume._volume_opts, manila.volume._volume_opts,
manila.volume.cinder.cinder_opts,
manila.wsgi.eventlet_opts, manila.wsgi.eventlet_opts,
manila.wsgi.socket_opts, manila.wsgi.socket_opts,
] ]
_opts = [ _opts = [
(None, list(itertools.chain(*_global_opt_lists))), (None, list(itertools.chain(*_global_opt_lists))),
(manila.volume.cinder.CINDER_GROUP,
list(itertools.chain(manila.volume.cinder.cinder_opts))),
(manila.compute.nova.NOVA_GROUP,
list(itertools.chain(manila.compute.nova.nova_opts))),
(manila.network.neutron.api.NEUTRON_GROUP,
list(itertools.chain(manila.network.neutron.api.neutron_opts))),
] ]
_opts.extend(oslo_concurrency.opts.list_opts()) _opts.extend(oslo_concurrency.opts.list_opts())

5
releasenotes/notes/bug-1613303-fix-config-generator-18b9f9be40d7eee6.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- Fixed the generation of options in the correct option groups. Using the
config generator (``tox -e genconfig``), [cinder], [nova] and [neutron]
options are now generated in the right groups instead of [default].