openstack
/
cinder
Code Issues Proposed changes

Merge "Fixes cinder volume delete on Windows" into milestone-proposed

This commit is contained in:
Jenkins 2014-04-04 19:35:04 +00:00 committed by Gerrit Code Review
parent 8d1da6e71c c70d356352
commit 5a95010dbf
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cinder/volume/drivers/windows/windows_utils.py
View File

@ -235,7 +235,12 @@ class WindowsUtils(object):
def remove_iscsi_target(self, target_name):
"""Removes ISCSI target."""
try:
wt_host = self._conn_wmi.WT_Host(HostName=target_name)[0]
host = self._conn_wmi.WT_Host(HostName=target_name)
if not host:
LOG.debug(_('Skipping removing target %s as it does not '
'exist.') % target_name)
return
wt_host = host[0]
wt_host.RemoveAllWTDisks()
wt_host.Delete_()
except wmi.x_wmi as exc: