Changes in ScaleIO configurations options

Removed force_delete as we don't use it anymore.
Other aesthetic changes from our doc team.

DocImpact
Change-Id: Ida9f82b0eaab75882d911f32c79f52660cef3265

diff --git a/cinder/tests/unit/volume/drivers/emc/scaleio/test_delete_snapshot.py b/cinder/tests/unit/volume/drivers/emc/scaleio/test_delete_snapshot.py
index 5c8c72c5e12b3f77f2a034c49b61291532645bee..ba9a56f937b1d5d3eb113ffa6d68ef2539ad369c 100644 (file)
--- a/cinder/tests/unit/volume/drivers/emc/scaleio/test_delete_snapshot.py
+++ b/cinder/tests/unit/volume/drivers/emc/scaleio/test_delete_snapshot.py
@@ -81,12 +81,6 @@ class TestDeleteSnapShot(scaleio.TestScaleIODriver):
         self.assertRaises(exception.VolumeBackendAPIException,
                           self.driver.delete_snapshot, self.snapshot)
 
-    def test_delete_invalid_snapshot_force_delete(self):
-        self.driver.configuration.set_override('sio_force_delete',
-                                               override=True)
-        self.set_https_response_mode(self.RESPONSE_MODE.Valid)
-        self.driver.delete_snapshot(self.snapshot)
-
     def test_delete_invalid_snapshot(self):
         self.set_https_response_mode(self.RESPONSE_MODE.Valid)
         self.driver.delete_snapshot(self.snapshot)

diff --git a/cinder/volume/drivers/emc/scaleio.py b/cinder/volume/drivers/emc/scaleio.py
index fbdb835051b17e748cd021269570206d18ea6bfb..3ee76b8c462be2f22604eae0fa52120fc1d8f03b 100644 (file)
--- a/cinder/volume/drivers/emc/scaleio.py
+++ b/cinder/volume/drivers/emc/scaleio.py
@@ -48,28 +48,25 @@ scaleio_opts = [
                help='REST server port.'),
     cfg.BoolOpt('sio_verify_server_certificate',
                 default=False,
-                help='Whether to verify server certificate.'),
+                help='Verify server certificate.'),
     cfg.StrOpt('sio_server_certificate_path',
                help='Server certificate path.'),
     cfg.BoolOpt('sio_round_volume_capacity',
                 default=True,
-                help='Whether to round volume capacity.'),
-    cfg.BoolOpt('sio_force_delete',
-                default=False,
-                help='Whether to allow force delete.'),
+                help='Round up volume capacity.'),
     cfg.BoolOpt('sio_unmap_volume_before_deletion',
                 default=False,
-                help='Whether to unmap volume before deletion.'),
+                help='Unmap volume before deletion.'),
     cfg.StrOpt('sio_protection_domain_id',
-               help='Protection domain id.'),
+               help='Protection Domain ID.'),
     cfg.StrOpt('sio_protection_domain_name',
-               help='Protection domain name.'),
+               help='Protection Domain name.'),
     cfg.StrOpt('sio_storage_pools',
-               help='Storage pools.'),
+               help='Storage Pools.'),
     cfg.StrOpt('sio_storage_pool_name',
-               help='Storage pool name.'),
+               help='Storage Pool name.'),
     cfg.StrOpt('sio_storage_pool_id',
-               help='Storage pool id.')
+               help='Storage Pool ID.')
 ]
 
 CONF.register_opts(scaleio_opts)

diff --git a/releasenotes/notes/scaleio-remove-force-delete-config-48fae029e3622d6d.yaml b/releasenotes/notes/scaleio-remove-force-delete-config-48fae029e3622d6d.yaml
new file mode 100755 (executable)
index 0000000..57d2fa2
--- /dev/null
+++ b/releasenotes/notes/scaleio-remove-force-delete-config-48fae029e3622d6d.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - removed force_delete option from ScaleIO configuration.
\ No newline at end of file