Fixes cinder volume attach on Windows

The initiator name and the target name are inverted when passing
the arguments to the method which associates the iSCSI target to
an initiator. For this reason, this operation will fail.

Also, the connection to the iSCSI target cannot be initialized
properly as the method which gets portal information is missing
the return value.

Change-Id: I31034cd407d12d69a410f8c9e86a2e6821349dad
Closes-Bug: #1299131
(cherry picked from commit 23e820abb8)
This commit is contained in:
Lucian Petrut 2014-03-28 10:57:13 +02:00 committed by john-griffith
parent a3a3b83587
commit 3ac2139500
2 changed files with 4 additions and 2 deletions

View File

@ -68,8 +68,8 @@ class WindowsDriver(driver.ISCSIDriver):
initiator_name = connector['initiator']
target_name = volume['provider_location']
self.utils.associate_initiator_with_iscsi_target(target_name,
initiator_name)
self.utils.associate_initiator_with_iscsi_target(initiator_name,
target_name)
properties = self.utils.get_host_information(volume, target_name)

View File

@ -90,6 +90,8 @@ class WindowsUtils(object):
properties['auth_username'] = auth_username
properties['auth_password'] = auth_secret
return properties
def associate_initiator_with_iscsi_target(self, initiator_name,
target_name):
"""Sets information used by the iSCSI target entry."""