openstack/cinder
Code Issues Proposed changes

Remove deprecated iSCSI target config opts

Browse Source 
The iSCSI target config options were deprecated in favor of more general
target config options in the Queens release. This completes the removal
of those options.

Change-Id: Ic65eed63c1de4f4888d572dad5bf9e945bceb16b
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
This commit is contained in:
Sean McGinnis 2018-08-22 14:06:42 -05:00
parent f68a0e80ed
commit e449846621
No known key found for this signature in database
GPG Key ID: CE7EE4BFAF8D70C8
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, min=0, max=100,
help='The percentage of backend capacity is reserved'), help='The percentage of backend capacity is reserved'),
cfg.StrOpt('target_prefix', cfg.StrOpt('target_prefix',
deprecated_name='iscsi_target_prefix',
default='iqn.2010-10.org.openstack:', default='iqn.2010-10.org.openstack:',
help='Prefix for iSCSI volumes'), help='Prefix for iSCSI volumes'),
cfg.StrOpt('target_ip_address', cfg.StrOpt('target_ip_address',
deprecated_name='iscsi_ip_address',
default='$my_ip', default='$my_ip',
help='The IP address that the iSCSI daemon is listening on'), help='The IP address that the iSCSI daemon is listening on'),
cfg.ListOpt('iscsi_secondary_ip_addresses', cfg.ListOpt('iscsi_secondary_ip_addresses',
default=[], default=[],
help='The list of secondary IP addresses of the iSCSI daemon'), help='The list of secondary IP addresses of the iSCSI daemon'),
cfg.PortOpt('target_port', cfg.PortOpt('target_port',
deprecated_name='iscsi_port',
default=3260, default=3260,
help='The port that the iSCSI daemon is listening on'), help='The port that the iSCSI daemon is listening on'),
cfg.IntOpt('num_volume_device_scan_tries', cfg.IntOpt('num_volume_device_scan_tries',
@ -92,7 +89,6 @@ volume_opts = [
'of the process used to zero a volume after deletion, ' 'of the process used to zero a volume after deletion, '
'for example "-c3" for idle only priority.'), 'for example "-c3" for idle only priority.'),
cfg.StrOpt('target_helper', cfg.StrOpt('target_helper',
deprecated_name='iscsi_helper',
default='tgtadm', default='tgtadm',
choices=['tgtadm', 'lioadm', 'scstadmin', 'iscsictl', choices=['tgtadm', 'lioadm', 'scstadmin', 'iscsictl',
'ietadm', 'nvmet', 'fake'], 'ietadm', 'nvmet', 'fake'],
@ -144,7 +140,6 @@ volume_opts = [
'using bsoflags option. The specified string is passed ' 'using bsoflags option. The specified string is passed '
'as is to the underlying tool.'), 'as is to the underlying tool.'),
cfg.StrOpt('target_protocol', cfg.StrOpt('target_protocol',
deprecated_name='iscsi_protocol',
default='iscsi', default='iscsi',
choices=['iscsi', 'iser', 'nvmet_rdma'], choices=['iscsi', 'iser', 'nvmet_rdma'],
help='Determines the target protocol for new volumes, ' 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.