openstack/cinder
Code Issues Proposed changes

Remove the rest of ietadm

Browse Source 
The IET target was removed in Zed, remove
the remaining config references to it.

Use of the "ietadm" target_helper would have
already caused initialization of the LVM driver
to fail, as the iet class is missing.

Change-Id: I257432b6e4947f7084763069ce067c7d3e31528e
This commit is contained in:
Eric Harney 2024-04-12 09:28:52 -04:00
parent f3a63ed6fa
commit d79e808c6e
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cinder/volume/driver.py
View File

@ -88,23 +88,17 @@ volume_opts = [
cfg.StrOpt('target_helper', cfg.StrOpt('target_helper',
default='tgtadm', default='tgtadm',
choices=['tgtadm', 'lioadm', 'scstadmin', 'iscsictl', choices=['tgtadm', 'lioadm', 'scstadmin', 'iscsictl',
'ietadm', 'nvmet', 'spdk-nvmeof', 'fake'], 'nvmet', 'spdk-nvmeof', 'fake'],
help='Target user-land tool to use. tgtadm is default, ' help='Target user-land tool to use. tgtadm is default, '
'use lioadm for LIO iSCSI support, scstadmin for SCST ' 'use lioadm for LIO iSCSI support, scstadmin for SCST '
'target support, ietadm for iSCSI Enterprise Target, ' 'target support, '
'iscsictl for Chelsio iSCSI Target, nvmet for NVMEoF ' 'iscsictl for Chelsio iSCSI Target, nvmet for NVMEoF '
'support, spdk-nvmeof for SPDK NVMe-oF, ' 'support, spdk-nvmeof for SPDK NVMe-oF, '
'or fake for testing. Note: The IET driver is deprecated ' 'or fake for testing.'),
'and will be removed in the V release.'),
cfg.StrOpt('volumes_dir', cfg.StrOpt('volumes_dir',
default='$state_path/volumes', default='$state_path/volumes',
help='Volume configuration file storage ' help='Volume configuration file storage '
'directory'), 'directory'),
cfg.StrOpt('iet_conf',
default='/etc/iet/ietd.conf',
deprecated_for_removal=True,
deprecated_reason='IET target driver is no longer supported.',
help='DEPRECATED: IET configuration file'),
cfg.StrOpt('chiscsi_conf', cfg.StrOpt('chiscsi_conf',
default='/etc/chelsio-iscsi/chiscsi.conf', default='/etc/chelsio-iscsi/chiscsi.conf',
help='Chiscsi (CXT) global defaults configuration file'), help='Chiscsi (CXT) global defaults configuration file'),
@ -114,7 +108,11 @@ volume_opts = [
help=('Sets the behavior of the iSCSI target ' help=('Sets the behavior of the iSCSI target '
'to either perform blockio or fileio ' 'to either perform blockio or fileio '
'optionally, auto can be set and Cinder ' 'optionally, auto can be set and Cinder '
'will autodetect type of backing device')), 'will autodetect type of backing device'),
deprecated_for_removal=True,
deprecated_since='2024.2',
deprecated_reason='No longer used (was for ietadm).'
),
cfg.StrOpt('volume_dd_blocksize', cfg.StrOpt('volume_dd_blocksize',
default='1M', default='1M',
help='The default block size used when copying/clearing ' help='The default block size used when copying/clearing '
@ -464,7 +462,6 @@ class BaseVD(object, metaclass=abc.ABCMeta):
# (intended for LVM, but others could use as well) # (intended for LVM, but others could use as well)
self.target_mapping = { self.target_mapping = {
'fake': 'cinder.volume.targets.fake.FakeTarget', 'fake': 'cinder.volume.targets.fake.FakeTarget',
'ietadm': 'cinder.volume.targets.iet.IetAdm',
'lioadm': 'cinder.volume.targets.lio.LioAdm', 'lioadm': 'cinder.volume.targets.lio.LioAdm',
'tgtadm': 'cinder.volume.targets.tgt.TgtAdm', 'tgtadm': 'cinder.volume.targets.tgt.TgtAdm',
'scstadmin': 'cinder.volume.targets.scst.SCSTAdm', 'scstadmin': 'cinder.volume.targets.scst.SCSTAdm',

2
cinder/volume/drivers/lvm.py
View File

@ -137,7 +137,7 @@ class LVMVolumeDriver(driver.VolumeDriver):
'target_prefix', 'volumes_dir', 'target_secondary_ip_addresses', 'target_prefix', 'volumes_dir', 'target_secondary_ip_addresses',
'target_port', 'target_port',
'iscsi_write_cache', 'iscsi_target_flags', # TGT 'iscsi_write_cache', 'iscsi_target_flags', # TGT
'iet_conf', 'iscsi_iotype', # IET 'iscsi_iotype', # IET
'nvmet_port_id', 'nvmet_ns_id', # NVMET 'nvmet_port_id', 'nvmet_ns_id', # NVMET
'scst_target_iqn_name', 'scst_target_driver', # SCST 'scst_target_iqn_name', 'scst_target_driver', # SCST
'spdk_rpc_ip', 'spdk_rpc_port', 'spdk_rpc_username', # SPDKNVMF 'spdk_rpc_ip', 'spdk_rpc_port', 'spdk_rpc_username', # SPDKNVMF