Andrew Bogott has submitted this change and it was merged.

Change subject: Designate:  Backport liberty policy changes to kilo
......................................................................


Designate:  Backport liberty policy changes to kilo

Change-Id: Ib0b1de3f8726d5deb26b9fea70981a7819daef36
---
M modules/openstack/files/kilo/designate/policy.json
1 file changed, 9 insertions(+), 9 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/openstack/files/kilo/designate/policy.json 
b/modules/openstack/files/kilo/designate/policy.json
index 79c234c..99d7d29 100644
--- a/modules/openstack/files/kilo/designate/policy.json
+++ b/modules/openstack/files/kilo/designate/policy.json
@@ -1,7 +1,7 @@
 {
     "admin": "role:admin or is_admin:True",
     "member": "tenant:%(tenant_id)s",
-    "admin_or_member": "rule:admin or rule:member",
+    "admin_or_member": "rule:admin or role:user or role:projectadmin",
     "admin_or_projectadmin": "rule:admin or role:projectadmin",
     "target": "tenant:%(target_tenant_id)s",
     "member_or_target":"rule:target or rule:member",
@@ -39,22 +39,22 @@
     "get_domains": "rule:admin_or_member",
     "get_domain": "rule:admin_or_member",
     "get_domain_servers": "rule:admin_or_member",
-    "find_domains": "rule:admin_or_projectadmin",
-    "find_domain": "rule:admin_or_projectadmin",
+    "find_domains": "rule:admin_or_member",
+    "find_domain": "rule:admin_or_member",
     "update_domain": "rule:admin",
     "delete_domain": "rule:admin",
     "abandon_domain": "rule:admin",
-    "count_domains": "rule:admin_or_projectadmin",
+    "count_domains": "rule:admin_or_member",
     "touch_domain": "rule:admin",
 
     "create_record": "rule:admin_or_projectadmin",
-    "get_records": "rule:admin_or_projectadmin",
-    "get_record": "rule:admin_or_projectadmin",
-    "find_records": "rule:admin_or_projectadmin",
-    "find_record": "rule:admin_or_projectadmin",
+    "get_records": "rule:admin_or_member",
+    "get_record": "rule:admin_or_member",
+    "find_records": "rule:admin_or_member",
+    "find_record": "rule:admin_or_member",
     "update_record": "rule:admin_or_projectadmin",
     "delete_record": "rule:admin_or_projectadmin",
-    "count_records": "rule:admin_or_projectadmin",
+    "count_records": "rule:admin_or_member",
 
     "use_sudo": "rule:admin",
 

-- 
To view, visit https://gerrit.wikimedia.org/r/279732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0b1de3f8726d5deb26b9fea70981a7819daef36
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to