From 8ce6e6c343043a7bc5ebf01a049e4d4a6c34d443 Mon Sep 17 00:00:00 2001
From: Rob Cresswell <robert.cresswell@outlook.com>
Date: Tue, 4 Oct 2016 14:17:42 +0100
Subject: [PATCH] Update Glance sample policy file

Sample policy file is out of sync with Glance repo; we should update it
to make dev/deployer work easier.

Change-Id: I4891e13a387729660e43f476796731937da0aa6e
---
 openstack_dashboard/conf/glance_policy.json   | 31 ++++++++++++-------
 .../dashboards/admin/metadata_defs/tables.py  |  2 +-
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/openstack_dashboard/conf/glance_policy.json b/openstack_dashboard/conf/glance_policy.json
index 839e7cf740..0a058c1c5d 100644
--- a/openstack_dashboard/conf/glance_policy.json
+++ b/openstack_dashboard/conf/glance_policy.json
@@ -1,14 +1,13 @@
 {
     "context_is_admin":  "role:admin",
-    "admin_or_owner":  "is_admin:True or project_id:%(project_id)s",
-    "default": "rule:admin_or_owner",
+    "default": "role:admin",
 
     "add_image": "",
-    "delete_image": "rule:admin_or_owner",
+    "delete_image": "",
     "get_image": "",
     "get_images": "",
-    "modify_image": "rule:admin_or_owner",
-    "publicize_image": "",
+    "modify_image": "",
+    "publicize_image": "role:admin",
     "copy_from": "",
 
     "download_image": "",
@@ -26,16 +25,18 @@
 
     "manage_image_cache": "role:admin",
 
-    "get_task": "",
-    "get_tasks": "",
-    "add_task": "",
-    "modify_task": "",
+    "get_task": "role:admin",
+    "get_tasks": "role:admin",
+    "add_task": "role:admin",
+    "modify_task": "role:admin",
+
+    "deactivate": "",
+    "reactivate": "",
 
     "get_metadef_namespace": "",
     "get_metadef_namespaces":"",
     "modify_metadef_namespace":"",
     "add_metadef_namespace":"",
-    "delete_metadef_namespace":"",
 
     "get_metadef_object":"",
     "get_metadef_objects":"",
@@ -43,10 +44,18 @@
     "add_metadef_object":"",
 
     "list_metadef_resource_types":"",
+    "get_metadef_resource_type":"",
     "add_metadef_resource_type_association":"",
 
     "get_metadef_property":"",
     "get_metadef_properties":"",
     "modify_metadef_property":"",
-    "add_metadef_property":""
+    "add_metadef_property":"",
+
+    "get_metadef_tag":"",
+    "get_metadef_tags":"",
+    "modify_metadef_tag":"",
+    "add_metadef_tag":"",
+    "add_metadef_tags":""
+
 }
diff --git a/openstack_dashboard/dashboards/admin/metadata_defs/tables.py b/openstack_dashboard/dashboards/admin/metadata_defs/tables.py
index 580281d6b6..0b5a3e649a 100644
--- a/openstack_dashboard/dashboards/admin/metadata_defs/tables.py
+++ b/openstack_dashboard/dashboards/admin/metadata_defs/tables.py
@@ -57,7 +57,7 @@ class DeleteNamespace(tables.DeleteAction):
             count
         )
 
-    policy_rules = (("image", "delete_metadef_namespace"),)
+    policy_rules = (("image", "modify_metadef_namespace"),)
 
     def allowed(self, request, namespace=None):
         # Protected namespaces can not be deleted.