openstack
/
cinder
Code Issues Proposed changes

Remove reference to ThinLVMVolumeDrive 

ThinLVMVolumeDrive was removed a while ago so it's safe to do this
cleanup.

Change-Id: If2f8e6b09fb49587ed7454ebfdf6069041d371f1
This commit is contained in:
Ivan Kolodyazhny 2020-03-26 15:15:56 +02:00
parent 48f648462a
commit be46f9b6b5
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/volume/driver.py
View File

@ -2643,9 +2643,7 @@ class ISCSIDriver(VolumeDriver):
try:
lun = int(results[2])
except (IndexError, ValueError):
if (self.configuration.volume_driver ==
'cinder.volume.drivers.lvm.ThinLVMVolumeDriver' and
self.configuration.target_helper == 'tgtadm'):
if self.configuration.target_helper == 'tgtadm':
lun = 1
else:
lun = 0

11
cinder/volume/targets/iscsi.py
View File

@ -103,16 +103,7 @@ class ISCSITarget(driver.Target):
try:
lun = int(results[2])
except (IndexError, ValueError):
# NOTE(jdg): The following is carried over from the existing
# code. The trick here is that different targets use different
# default lun numbers, the base driver with tgtadm uses 1
# others like LIO use 0.
if (self.configuration.volume_driver ==
'cinder.volume.drivers.lvm.ThinLVMVolumeDriver' and
self.configuration.target_helper == 'tgtadm'):
lun = 1
else:
lun = 0
lun = 0
if nr_portals > 1 or multipath:
properties['target_portals'] = portals