diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-11-14 17:38:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-11-14 17:38:10 +0000 |
| commit | 24d908f8eb294ee7d82003bc8930e12de4c99c10 (patch) | |
| tree | 5d4162fae897cd06781915ecb2dc23a820459b14 | |
| parent | 8a427cf3cc623f6683d5988a1438dbe1fb16f645 (diff) | |
| parent | 69f801c3497c768a10fa33aac42951f1e29c977b (diff) | |
| download | glance_store-24d908f8eb294ee7d82003bc8930e12de4c99c10.tar.gz | |
Merge "Fix public image ACL in multi-tenant Swift mode"0.1.10
| -rw-r--r-- | glance_store/_drivers/swift/store.py | 2 | ||||
| -rw-r--r-- | tests/unit/test_swift_store.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/glance_store/_drivers/swift/store.py b/glance_store/_drivers/swift/store.py index 2040982..39dbfbf 100644 --- a/glance_store/_drivers/swift/store.py +++ b/glance_store/_drivers/swift/store.py @@ -786,7 +786,7 @@ class MultiTenantStore(BaseStore): headers = {} if public: - headers['X-Container-Read'] = ".r:*,.rlistings" + headers['X-Container-Read'] = "*:*" elif read_tenants: headers['X-Container-Read'] = ','.join('%s:*' % i for i in read_tenants) diff --git a/tests/unit/test_swift_store.py b/tests/unit/test_swift_store.py index f62e632..6f4133d 100644 --- a/tests/unit/test_swift_store.py +++ b/tests/unit/test_swift_store.py @@ -757,7 +757,7 @@ class SwiftTests(object): container_headers = swiftclient.client.head_container('x', 'y', 'glance') self.assertEqual(container_headers['X-Container-Read'], - ".r:*,.rlistings") + "*:*") def test_read_acl_tenants(self): """ |