openstack/cinder
Code Issues Proposed changes

Move 'zoning_mode' back to DEFAULT section

Browse Source 
We moved 'zoning_mode' option to 'backend_defaults'
section since patch: [1]. But it has two issues:

1. It can not work because we still fetch the value
from the default section [2].
2. From the view of our current design. It's only
used in our framework code, which means it still can
not work if we overwrite the default value in one
specific backend section, such as:

[backend_defaults]
zoning_mode=fabric
[lvmbackend_1]
zoning_mode=other_value

Move this option back to DEFAULT section until we
need to.

Closes-Bug: #1724418

[1]: https://review.openstack.org/#/c/453654/
[2]: https://github.com/openstack/cinder/blob/master/cinder/zonemanager/utils.py#L56

Change-Id: I5b31082296f5bff5089d0f42a62d44bb009d177d
This commit is contained in:
TommyLike 2017-10-16 15:59:00 +08:00
parent 66fde42d10
commit 34287e3fa3
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 '