Merge "Ensure swift_store_admin_tenants ACLs are set"
This commit is contained in:
commit
2fdd1df173
@ -76,9 +76,9 @@ class BaseController(object):
|
|||||||
write_tenants.append(member['member_id'])
|
write_tenants.append(member['member_id'])
|
||||||
else:
|
else:
|
||||||
read_tenants.append(member['member_id'])
|
read_tenants.append(member['member_id'])
|
||||||
store.set_acls(req.context, location_uri, public=public,
|
store.set_acls(req.context, location_uri, public=public,
|
||||||
read_tenants=read_tenants,
|
read_tenants=read_tenants,
|
||||||
write_tenants=write_tenants)
|
write_tenants=write_tenants)
|
||||||
except exception.UnknownScheme:
|
except exception.UnknownScheme:
|
||||||
msg = _("Store for image_id not found: %s") % image_id
|
msg = _("Store for image_id not found: %s") % image_id
|
||||||
raise webob.exc.HTTPBadRequest(explanation=msg,
|
raise webob.exc.HTTPBadRequest(explanation=msg,
|
||||||
|
Loading…
Reference in New Issue
Block a user