diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py index 7f73317e314..5dc7f9d6769 100644 --- a/cinder/volume/driver.py +++ b/cinder/volume/driver.py @@ -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, ' diff --git a/releasenotes/notes/remove-iscsi-target-config-options-d23e424eb8f82042.yaml b/releasenotes/notes/remove-iscsi-target-config-options-d23e424eb8f82042.yaml new file mode 100644 index 00000000000..5690ea03e28 --- /dev/null +++ b/releasenotes/notes/remove-iscsi-target-config-options-d23e424eb8f82042.yaml @@ -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.