openstack/cinder
Code Issues Proposed changes

Merge "Remove deprecated iSCSI target config opts"

Browse Source
This commit is contained in:
Zuul 2018-10-30 18:08:36 +00:00 committed by Gerrit Code Review
commit 5f02096a63
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cinder/volume/driver.py
View File

@ -49,18 +49,15 @@ volume_opts = [
min=0, max=100,
help='The percentage of backend capacity is reserved'),
cfg.StrOpt('target_prefix',
deprecated_name='iscsi_target_prefix',
default='iqn.2010-10.org.openstack:',
help='Prefix for iSCSI volumes'),
cfg.StrOpt('target_ip_address',
deprecated_name='iscsi_ip_address',
default='$my_ip',
help='The IP address that the iSCSI daemon is listening on'),
cfg.ListOpt('iscsi_secondary_ip_addresses',
default=[],
help='The list of secondary IP addresses of the iSCSI daemon'),
cfg.PortOpt('target_port',
deprecated_name='iscsi_port',
default=3260,
help='The port that the iSCSI daemon is listening on'),
cfg.IntOpt('num_volume_device_scan_tries',
@ -92,7 +89,6 @@ volume_opts = [
'of the process used to zero a volume after deletion, '
'for example "-c3" for idle only priority.'),
cfg.StrOpt('target_helper',
deprecated_name='iscsi_helper',
default='tgtadm',
choices=['tgtadm', 'lioadm', 'scstadmin', 'iscsictl',
'ietadm', 'nvmet', 'fake'],
@ -144,7 +140,6 @@ volume_opts = [
'using bsoflags option. The specified string is passed '
'as is to the underlying tool.'),
cfg.StrOpt('target_protocol',
deprecated_name='iscsi_protocol',
default='iscsi',
choices=['iscsi', 'iser', 'nvmet_rdma'],
help='Determines the target protocol for new volumes, '

8
releasenotes/notes/remove-iscsi-target-config-options-d23e424eb8f82042.yaml Normal file
View File

@ -0,0 +1,8 @@
---
upgrade:
- |
The config options ``iscsi_ip_address``, ``iscsi_port``, ``target_helper``,
``iscsi_target_prefix`` and ``iscsi_protocol`` were deprecated in the
Queens release and have now been removed. Deployments should now used the
more general ``target_ip_address``, ``target_port``, ``target_helper``,
``target_prefix`` and ``target_protocol`` options.