summaryrefslogtreecommitdiff
path: root/ceilometermiddleware
diff options
context:
space:
mode:
authorClément Contini <ccontini@cloudops.com>2015-08-14 13:52:16 -0400
committerClément Contini <ccontini@cloudops.com>2015-08-14 14:10:32 -0400
commitcfb357cf51a5434a10e43a591a009e549ec1fd90 (patch)
treeaab0d333d874f2388017e463d5c53c65dabd52e4 /ceilometermiddleware
parent1eb9cc6f333bc9c3fe5577e460d9825cec4118ec (diff)
downloadceilometermiddleware-cfb357cf51a5434a10e43a591a009e549ec1fd90.tar.gz
HTTP_X_TENANT_ID is deprecated and replaced by HTTP_X_PROJECT_ID
Change-Id: I619d9db86ddcb6f3599c2d1c3c37a3628b9c7239
Diffstat (limited to 'ceilometermiddleware')
-rw-r--r--ceilometermiddleware/swift.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/ceilometermiddleware/swift.py b/ceilometermiddleware/swift.py
index 70201d5..b5dad37 100644
--- a/ceilometermiddleware/swift.py
+++ b/ceilometermiddleware/swift.py
@@ -216,7 +216,8 @@ class Swift(object):
initiator = cadf_resource.Resource(
typeURI='service/security/account/user',
id=env.get('HTTP_X_USER_ID'))
- initiator.project_id = env.get('HTTP_X_TENANT_ID')
+ initiator.project_id = (env.get('HTTP_X_PROJECT_ID') or
+ env.get('HTTP_X_TENANT_ID'))
# build notification body
event = cadf_event.Event(eventTime=now, outcome=outcome,