From 6e2d8fd0664d468228d78ceea0e96e10d560be6a Mon Sep 17 00:00:00 2001
From: Eric Harney <eharney@redhat.com>
Date: Tue, 11 Apr 2017 11:25:09 -0400
Subject: [PATCH] Fix encryption key deletion error handling on volume delete

e.msg is only present for CinderExceptions, not all exception
types.

Closes-Bug: #1681874

Change-Id: I02601ae2a9ba95ab7145b86e24a094272f4cfbf6
---
 cinder/volume/api.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cinder/volume/api.py b/cinder/volume/api.py
index d6b6ac96eb2..e7209667e0b 100644
--- a/cinder/volume/api.py
+++ b/cinder/volume/api.py
@@ -467,9 +467,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("Unable to delete encryption key for "
                             "volume: %s.", e.msg, resource=volume)
+            except Exception:
+                LOG.exception("Unable to delete encryption key for "
+                              "volume.")
 
         self.volume_rpcapi.delete_volume(context,
                                          volume,