openstack/cinder
Code Issues Proposed changes

Merge "Move 'zoning_mode' back to DEFAULT section"

Browse Source
This commit is contained in:
Zuul 2017-10-25 05:46:34 +00:00 committed by Gerrit Code Review
commit 859d3ac945
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cinder/volume/manager.py
View File

@ -120,14 +120,15 @@ volume_manager_opts = [
default=False, default=False,
help='Offload pending volume delete during ' help='Offload pending volume delete during '
'volume service startup'), 'volume service startup'),
cfg.StrOpt('zoning_mode',
help="FC Zoning mode configured, only 'fabric' is "
"supported now."),
] ]
volume_backend_opts = [ volume_backend_opts = [
cfg.StrOpt('volume_driver', cfg.StrOpt('volume_driver',
default='cinder.volume.drivers.lvm.LVMVolumeDriver', default='cinder.volume.drivers.lvm.LVMVolumeDriver',
help='Driver to use for volume creation'), help='Driver to use for volume creation'),
cfg.StrOpt('zoning_mode',
help='FC Zoning mode configured'),
cfg.StrOpt('extra_capabilities', cfg.StrOpt('extra_capabilities',
default='{}', default='{}',
help='User defined capabilities, a JSON formatted string ' help='User defined capabilities, a JSON formatted string '