Merge "ScaleIO could connect wrong volume to VM"

This commit is contained in:
Jenkins
2015-12-18 22:59:30 +00:00
committed by Gerrit Code Review

View File

@@ -2508,6 +2508,7 @@ class ScaleIOConnector(InitiatorConnector):
'path': self.volume_path}
return device_info
@lockutils.synchronized('scaleio', 'scaleio-')
def connect_volume(self, connection_properties):
"""Connect the volume.
@@ -2636,6 +2637,7 @@ class ScaleIOConnector(InitiatorConnector):
return device_info
@lockutils.synchronized('scaleio', 'scaleio-')
def disconnect_volume(self, connection_properties, device_info):
"""Disconnect the ScaleIO volume.