switch to using webob exception

1 files changed, 4 insertions, 6 deletions

diff --git a/nova/api/ec2/metadatarequesthandler.py b/nova/api/ec2/metadatarequesthandler.py
index 720f264a4..9c8e52270 100644
--- a/nova/api/ec2/metadatarequesthandler.py
+++ b/nova/api/ec2/metadatarequesthandler.py
@@ -76,12 +76,10 @@ class MetadataRequestHandler(wsgi.Application):
             meta_data = cc.get_metadata(remote_address)
         except Exception:
             LOG.exception(_('Failed to get metadata for ip: %s'), remote_address)
-            resp = webob.Response()
-            resp.status = 500
-            message = _('An unknown error has occurred. '
-                        'Please try your request again.')
-            resp.body = str(utils.utf8(message))
-            return resp
+            msg = _('An unknown error has occurred. '
+                    'Please try your request again.')
+            exc = webob.exc.HTTPInternalServerError(explanation=unicode(msg))
+            return exc
         if meta_data is None:
             LOG.error(_('Failed to get metadata for ip: %s'), remote_address)
             raise webob.exc.HTTPNotFound()