summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart McLaren <stuart.mclaren@hp.com>2014-10-24 10:42:44 +0000
committerStuart McLaren <stuart.mclaren@hp.com>2014-11-13 15:23:28 +0000
commit10a698536377b86424d15121942f199535f67d58 (patch)
tree90d65777199991fabcab81f2ef4016971a1ec427
parent540306eccb60b8cd5ecd86c3d15ed51291d98d15 (diff)
downloadglance-10a698536377b86424d15121942f199535f67d58.tar.gz
Swift Multi-tenant store: Pass context on upload
Image upload returns an E500 as the context is not being passed to the swift client. Change-Id: I2065b7dd281bfbb513f13270a0c062fc7132f763 Partial-bug: 1385213 (cherry picked from commit 867b696d884e9db707683eecd321789843798efd)
-rw-r--r--glance/api/v1/upload_utils.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/glance/api/v1/upload_utils.py b/glance/api/v1/upload_utils.py
index 763d6cb9d..8a190fcfe 100644
--- a/glance/api/v1/upload_utils.py
+++ b/glance/api/v1/upload_utils.py
@@ -103,7 +103,8 @@ def upload_data_to_store(req, image_meta, image_data, store, notifier):
image_meta['id'],
utils.CooperativeReader(image_data),
image_meta['size'],
- store)
+ store,
+ context=req.context)
location_data = {'url': uri,
'metadata': location_metadata,