Merge "Don't raise HTTPForbidden on a multitenant environment" into stable/grizzly
Jenkins authored 10 years ago
Gerrit Code Review committed 10 years ago
614 | 614 |
|
615 | 615 |
headers = {}
|
616 | 616 |
if public:
|
617 | |
headers['X-Container-Read'] = ".r:*"
|
|
617 |
headers['X-Container-Read'] = ".r:*,.rlistings"
|
618 | 618 |
elif read_tenants:
|
619 | 619 |
headers['X-Container-Read'] = ','.join(read_tenants)
|
620 | 620 |
else:
|
606 | 606 |
store.set_acls(loc, public=True)
|
607 | 607 |
container_headers = swiftclient.client.head_container('x', 'y',
|
608 | 608 |
'glance')
|
609 | |
self.assertEqual(container_headers['X-Container-Read'], ".r:*")
|
|
609 |
self.assertEqual(container_headers['X-Container-Read'],
|
|
610 |
".r:*,.rlistings")
|
610 | 611 |
|
611 | 612 |
def test_read_acl_tenants(self):
|
612 | 613 |
"""
|