summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-11-26 10:39:39 +0000
committerGerrit Code Review <review@openstack.org>2014-11-26 10:39:39 +0000
commitd81162ef94e7a31eeb548e65a7d4ced11406a8ee (patch)
tree68a67bb07dc5e6a0e7764f12aaee05258293de13
parentdef65d3a891a15a671f0713d3dbc9563228af9a7 (diff)
parent10a698536377b86424d15121942f199535f67d58 (diff)
downloadglance-d81162ef94e7a31eeb548e65a7d4ced11406a8ee.tar.gz
Merge "Swift Multi-tenant store: Pass context on upload" into stable/juno
-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,