openstack
/
nova
Code Issues Proposed changes

Correct IetAdm remove_iscsi_target 

Remove logical units should be done before delete the target while
unexport iSCSI volume. Or ietd will show "No such file or directory"
error.

Fix bug 1043107

Change-Id: I06ac561898dbcee078c807ea5368c03e558b4fa9
This commit is contained in:
MotoKen 2012-08-29 14:34:18 +08:00 committed by Vishvananda Ishaya
parent a484bfea8f
commit b46f224f75
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/tests/test_iscsi.py
View File

@ -118,5 +118,5 @@ class IetAdmTestCase(test.TestCase, TargetAdminTestCase):
'ietadm --op new --tid=%(tid)s --lun=%(lun)s '
'--params Path=%(path)s,Type=fileio',
'ietadm --op show --tid=%(tid)s',
'ietadm --op delete --tid=%(tid)s',
'ietadm --op delete --tid=%(tid)s --lun=%(lun)s'])
'ietadm --op delete --tid=%(tid)s --lun=%(lun)s',
'ietadm --op delete --tid=%(tid)s'])

2
nova/volume/iscsi.py
View File

@ -193,8 +193,8 @@ class IetAdm(TargetAdmin):
def remove_iscsi_target(self, tid, lun, vol_id, **kwargs):
LOG.info(_('Removing volume: %s') % vol_id)
self._delete_target(tid, **kwargs)
self._delete_logicalunit(tid, lun, **kwargs)
self._delete_target(tid, **kwargs)
def _new_target(self, name, tid, **kwargs):
self._run('--op', 'new',