openstack
/
deb-cinder
Code Issues Proposed changes

Merge "RemoteFS: prevent creation of encrypted volumes" into stable/ocata

This commit is contained in:
Jenkins 2017-05-24 16:55:21 +00:00 committed by Gerrit Code Review
parent ffd38cbc0b 689d746851
commit 76386bd214
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cinder/volume/drivers/remotefs.py
View File

@ -147,6 +147,7 @@ class RemoteFSDriver(driver.BaseVD):
self._mounted_shares = []
self._execute_as_root = True
self._is_voldb_empty_at_startup = kwargs.pop('is_vol_db_empty', None)
self._supports_encryption = False
if self.configuration:
self.configuration.append_config_values(nas_opts)
@ -234,6 +235,10 @@ class RemoteFSDriver(driver.BaseVD):
:returns: provider_location update dict for database
"""
if volume.encryption_key_id and not self._supports_encryption:
message = _("Encryption is not yet supported.")
raise exception.VolumeDriverException(message=message)
LOG.debug('Creating volume %(vol)s', {'vol': volume.id})
self._ensure_shares_mounted()