Merge "Don't add exception in msg when using LOG.exception"

magnum/common/keystone.py

@@ -120,8 +120,8 @@ class KeystoneClientV3(object):
                 trustee_user=trustee_user,
                 impersonation=impersonation,
                 role_names=role_names)
-        except Exception as e:
-            LOG.exception(str(e))
+        except Exception:
+            LOG.exception(_LE('Failed to create trust'))
             raise exception.TrustCreateFailed(
                 trustee_user_id=trustee_user)
         return trust
@@ -137,6 +137,6 @@ class KeystoneClientV3(object):
             self.client.trusts.delete(trust_id)
         except kc_exception.NotFound:
             pass
-        except Exception as e:
-            LOG.exception(str(e))
+        except Exception:
+            LOG.exception(_LE('Failed to delete trust'))
             raise exception.TrustDeleteFailed(trust_id=trust_id)

magnum/conductor/handlers/docker_conductor.py

@@ -37,9 +37,7 @@ def wrap_container_exception(f):
                 container_uuid = kwargs.get('container').uuid
 
             LOG.exception(_LE("Error while connect to docker "
-                              "container %(name)s: %(error)s"),
-                          {'name': container_uuid,
-                           'error': str(e)})
+                              "container %s"), container_uuid)
             raise exception.ContainerException(
                 "Docker internal Error: %s" % str(e))
     return functools.wraps(f)(wrapped)