Merge "Fixed invalid number of arguments bug in ScaleIO driver" into stable/rocky

This commit is contained in:
Zuul
2018-09-07 01:01:31 +00:00
committed by Gerrit Code Review
2 changed files with 2 additions and 3 deletions

View File

@@ -40,7 +40,7 @@ class ScaleIODriver(driver.ScaleIODriver):
def unmanage(self, volume):
pass
def _is_volume_creation_safe(self, _pd, _sp, _pt):
def _is_volume_creation_safe(self, _pd, _sp):
return True

View File

@@ -600,8 +600,7 @@ class ScaleIODriver(driver.VolumeDriver):
provisioning = "ThickProvisioned"
allowed = self._is_volume_creation_safe(protection_domain_name,
storage_pool_name,
provisioning)
storage_pool_name)
if not allowed:
# Do not allow thick volume creation on this backend.
# Volumes may leak data between tenants.