diff options
| -rw-r--r-- | cinder/volume/drivers/dell_emc/scaleio/driver.py | 16 | ||||
| -rw-r--r-- | releasenotes/notes/scaleio-thick-padding-deprecation-9eaa85333176e091.yaml | 13 |
2 files changed, 15 insertions, 14 deletions
diff --git a/cinder/volume/drivers/dell_emc/scaleio/driver.py b/cinder/volume/drivers/dell_emc/scaleio/driver.py index e23b9e95c..7a204e732 100644 --- a/cinder/volume/drivers/dell_emc/scaleio/driver.py +++ b/cinder/volume/drivers/dell_emc/scaleio/driver.py @@ -107,13 +107,8 @@ scaleio_opts = [ default=10.0, help='max_over_subscription_ratio setting for the driver. ' 'Maximum value allowed is 10.0.'), - cfg.BoolOpt('sio_allow_non_padded_thick_volumes', - default=False, - help='Allow thick volumes to be created in Storage Pools ' - 'when zero padding is disabled. This option should ' - 'not be enabled if multiple tenants will utilize ' - 'thick volumes from a shared Storage Pool.'), cfg.BoolOpt('sio_allow_non_padded_volumes', + deprecated_name='sio_allow_non_padded_thick_volumes', default=False, help='Allow volumes to be created in Storage Pools ' 'when zero padding is disabled. This option should ' @@ -500,8 +495,7 @@ class ScaleIODriver(driver.VolumeDriver): def _is_volume_creation_safe(self, protection_domain, - storage_pool, - provision_type): + storage_pool): """Checks if volume creation is safe or not. Using volumes with zero padding disabled can lead to existing data @@ -512,11 +506,6 @@ class ScaleIODriver(driver.VolumeDriver): # Enabled regardless of type, so safe to proceed return True - if (provision_type == 'ThickProvisioned' and - self.configuration.sio_allow_non_padded_thick_volumes): - # Enabled for thick volumes - return True - try: properties = self._get_storage_pool_properties(protection_domain, storage_pool) @@ -621,7 +610,6 @@ class ScaleIODriver(driver.VolumeDriver): "zero padding being disabled for pool, %s:%s. " "This behaviour can be changed by setting " "the configuration option " - "sio_allow_non_padded_thick_volumes = True or" "sio_allow_non_padded_volumes = True.", protection_domain_name, storage_pool_name) diff --git a/releasenotes/notes/scaleio-thick-padding-deprecation-9eaa85333176e091.yaml b/releasenotes/notes/scaleio-thick-padding-deprecation-9eaa85333176e091.yaml new file mode 100644 index 000000000..de3073ae8 --- /dev/null +++ b/releasenotes/notes/scaleio-thick-padding-deprecation-9eaa85333176e091.yaml @@ -0,0 +1,13 @@ +--- +deprecations: + - | + The ScaleIO configuration option ``sio_allow_non_padded_thick_volumes`` has + been deprecated and will be removed in a future release. Deployments should + now migrate to the option ``sio_allow_non_padded_volumes`` for equivalent + functionality. +upgrade: + - | + The ScaleIO configuration option ``sio_allow_non_padded_thick_volumes`` has + been deprecated and will be removed in a future release. Deployments should + now migrate to the option ``sio_allow_non_padded_volumes`` for equivalent + functionality. |