openstack/cinder
Code Issues Proposed changes

Merge "Add another hack from NOVA_GROUP to generate_cinder_opts.py"

Browse Source
This commit is contained in:
Jenkins 2017-09-19 09:24:04 +00:00 committed by Gerrit Code Review
commit 14d35a3f4c
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cinder/opts.py
View File

@ -285,12 +285,6 @@ def list_opts():
itertools.chain(
cinder_keymgr_confkeymgr.key_mgr_opts,
)),
('nova_group',
itertools.chain(
cinder_compute_nova.nova_opts,
cinder_compute_nova.nova_session_opts,
cinder_compute_nova.nova_auth_opts,
)),
('backend_defaults',
itertools.chain(
cinder_volume_driver.volume_opts,
@ -397,4 +391,10 @@ def list_opts():
cinder_volume_drivers_zte_zteks.zte_opts,
cinder_volume_manager.volume_backend_opts,
)),
('nova',
itertools.chain(
cinder_compute_nova.nova_opts,
cinder_compute_nova.nova_session_opts,
cinder_compute_nova.nova_auth_opts,
)),
]

3
tools/config/generate_cinder_opts.py
View File

@ -18,6 +18,7 @@ import subprocess
import textwrap
from cinder.volume import configuration
from cinder.compute import nova
OrderedDict = collections.OrderedDict
@ -215,6 +216,8 @@ if __name__ == "__main__":
if (group_name.endswith('SHARED_CONF_GROUP')
or group_name.lower() == 'backend_defaults'):
group_name = configuration.SHARED_CONF_GROUP
if (group_name == 'NOVA_GROUP'):
group_name = nova.NOVA_GROUP
if group_name in registered_opts_dict:
line = key + "." + formatted_opt