From 6b4ec4f02e81fb0a2dbb1e62bffdcb7fc6feadcf Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Tue, 13 Dec 2016 10:23:33 +0000 Subject: [PATCH] Update paste, policy and rootwrap configurations 2016-12-13 Change-Id: Ie872cb246b78c2f415111cd3f08a76ff9dd7d020 --- templates/policy.json.j2 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/templates/policy.json.j2 b/templates/policy.json.j2 index 88183720..7bb9cb16 100644 --- a/templates/policy.json.j2 +++ b/templates/policy.json.j2 @@ -1,9 +1,8 @@ { - "context_is_admin": "role:admin", - "admin_or_owner": "is_admin:True or project_id:%(project_id)s", + "admin_or_owner": "is_admin:True or (role:admin and is_admin_project:True) or project_id:%(project_id)s", "default": "rule:admin_or_owner", - "admin_api": "is_admin:True", + "admin_api": "is_admin:True or (role:admin and is_admin_project:True)", "volume:create": "", "volume:delete": "rule:admin_or_owner",