diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-28 23:06:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-28 23:06:09 +0000 |
| commit | 407345f5a2e1ed7102fccbb6fc2625e5d4df423b (patch) | |
| tree | bec6169e519eb8cd031f98517709c9758f3740b7 | |
| parent | 16295ae977ef70e23ec02bac5a2340a7dd22d7c5 (diff) | |
| parent | 3bb94dcad84ed4204d8809fcf95b7713daa2189b (diff) | |
| download | glance_store-407345f5a2e1ed7102fccbb6fc2625e5d4df423b.tar.gz | |
Merge "Swift Multi-tenant store: Fix image upload"
| -rw-r--r-- | glance_store/backend.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/glance_store/backend.py b/glance_store/backend.py index e300de7..d84a720 100644 --- a/glance_store/backend.py +++ b/glance_store/backend.py @@ -325,7 +325,10 @@ def store_add_to_backend(image_id, data, size, store, context=None): the checksum of the data the storage systems metadata dictionary for the location """ - (location, size, checksum, metadata) = store.add(image_id, data, size) + (location, size, checksum, metadata) = store.add(image_id, + data, + size, + context=context) if metadata is not None: if not isinstance(metadata, dict): msg = (_("The storage driver %(driver)s returned invalid " @@ -368,7 +371,8 @@ def set_acls(location_uri, public=False, read_tenants=[], try: store.set_acls(loc, public=public, read_tenants=read_tenants, - write_tenants=write_tenants) + write_tenants=write_tenants, + context=context) except NotImplementedError: LOG.debug(_("Skipping store.set_acls... not implemented.")) |