summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorAndrew Laski <andrew.laski@rackspace.com>2013-05-31 11:55:30 -0400
committerAndrew Laski <andrew.laski@rackspace.com>2013-06-04 15:39:09 -0400
commitedcf4eca66c91db032bdb56572eba4437947948d (patch)
treee8785e262eb3c8acd5775b357e281d0a5f9b2a13 /nova/api
parent0e760b3e94c53e8f794609a60343b392e7ff595c (diff)
downloadnova-edcf4eca66c91db032bdb56572eba4437947948d.tar.gz
nova-edcf4eca66c91db032bdb56572eba4437947948d.tar.xz
nova-edcf4eca66c91db032bdb56572eba4437947948d.zip
Add x-compute-request-id header when no response body
The x-compute-request-id header was only being added for requests which generated a response body, like an index or show. This adds it to requests which generate no response body, like create/update/delete, or actions on servers like resize. Bug 1183712 Change-Id: Ia0e9d75e4b84280caab060fae58036ed818e00c3
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/wsgi.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py
index eda82483f..bf5627b3a 100644
--- a/nova/api/openstack/wsgi.py
+++ b/nova/api/openstack/wsgi.py
@@ -972,7 +972,6 @@ class Resource(wsgi.Application):
# Run post-processing extensions
if resp_obj:
- _set_request_id_header(request, resp_obj)
# Do a preserialize to set up the response object
serializers = getattr(meth, 'wsgi_serializers', {})
resp_obj._bind_method_serializers(serializers)
@@ -988,6 +987,9 @@ class Resource(wsgi.Application):
response = resp_obj.serialize(request, accept,
self.default_serializers)
+ if context and hasattr(response, 'headers'):
+ response.headers.add('x-compute-request-id', context.request_id)
+
return response
def get_method(self, request, action, content_type, body):