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

This commit is contained in:
Jenkins 2014-04-03 15:36:02 +00:00 committed by Gerrit Code Review
commit 5a1fcc88ce
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."""