openstack
/
deb-cinder
Code Issues Proposed changes

Merge "Fix encryption key deletion error handling on volume delete" into stable/ocata

This commit is contained in:
Jenkins 2017-05-24 16:55:30 +00:00 committed by Gerrit Code Review
parent 76386bd214 8a090e5510
commit a64eaf9318
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cinder/volume/api.py
View File

@ -469,9 +469,12 @@ class API(base.Base):
if encryption_key_id is not None:
try:
self.key_manager.delete(context, encryption_key_id)
except Exception as e:
except exception.CinderException as e:
LOG.warning(_LW("Unable to delete encryption key for "
"volume: %s."), e.msg, resource=volume)
except Exception:
LOG.exception(_LE("Unable to delete encryption key for "
"volume."))
self.volume_rpcapi.delete_volume(context,
volume,