Correct the rest of the reraising of exception

When an exception was caught and rethrown, it should call 'raise'
without any arguments because it shows the place where an exception
occured initially instead of place where the exception re-raised.

Change-Id: I696054fc273edb62e87e5d567da6b99cdf5ec358

magnum/common/exception.py

@@ -89,18 +89,18 @@ class MagnumException(Exception):
 
         try:
             self.message = self.message % kwargs
-        except Exception as e:
+        except Exception:
             # kwargs doesn't match a variable in the message
             # log the issue and the kwargs
             LOG.exception(_LE('Exception in string format operation, '
                               'kwargs: %s') % kwargs)
             try:
                 if CONF.fatal_exception_format_errors:
-                    raise e
+                    raise
             except cfg.NoSuchOptError:
                 # Note: work around for Bug: #1447873
                 if CONF.oslo_versionedobjects.fatal_exception_format_errors:
-                    raise e
+                    raise
 
         super(MagnumException, self).__init__(self.message)
 

magnum/conductor/handlers/bay_conductor.py

@@ -164,7 +164,8 @@ class Handler(object):
             if isinstance(e, exc.HTTPBadRequest):
                 e = exception.InvalidParameterValue(message=six.text_type(e))
 
-            raise e
+                raise e
+            raise
 
         bay.stack_id = created_stack['stack']['id']
         bay.status = bay_status.CREATE_IN_PROGRESS