openstack/cinder
Code Issues Proposed changes

Changes in ScaleIO configurations options

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

DocImpact
Change-Id: Ida9f82b0eaab75882d911f32c79f52660cef3265
This commit is contained in:
Matan Sabag 2016-02-17 13:48:43 -08:00
parent 0f5e61bf6e
commit c20f09d80c
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/tests/unit/volume/drivers/emc/scaleio/test_delete_snapshot.py
View File

@ -81,12 +81,6 @@ class TestDeleteSnapShot(scaleio.TestScaleIODriver):
self.assertRaises(exception.VolumeBackendAPIException, self.assertRaises(exception.VolumeBackendAPIException,
self.driver.delete_snapshot, self.snapshot) 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): def test_delete_invalid_snapshot(self):
self.set_https_response_mode(self.RESPONSE_MODE.Valid) self.set_https_response_mode(self.RESPONSE_MODE.Valid)
self.driver.delete_snapshot(self.snapshot) self.driver.delete_snapshot(self.snapshot)

19
cinder/volume/drivers/emc/scaleio.py
View File

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

3
releasenotes/notes/scaleio-remove-force-delete-config-48fae029e3622d6d.yaml Executable file
View File

@ -0,0 +1,3 @@
---
upgrade:
- removed force_delete option from ScaleIO configuration.