From 7d52b191e606d9e1d1f4442c4da669c7efc1c9c1 Mon Sep 17 00:00:00 2001
From: Arvind Tiwari <arvind.tiwari@hp.com>
Date: Tue, 18 Feb 2014 12:58:34 -0700
Subject: [PATCH] use of more readable policy language in policy file

Translate the existing policy file to use more
readable policy language syntax.

Change-Id: I3f86d849380aa942ce40af9a271c0af074f59ffd
---
 etc/barbican/policy.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/etc/barbican/policy.json b/etc/barbican/policy.json
index 0f641afab..b40a44884 100644
--- a/etc/barbican/policy.json
+++ b/etc/barbican/policy.json
@@ -18,13 +18,13 @@
     "verifications:get": "rule:all_but_audit",
     "verification:get": "rule:all_users",
     "verification:delete": "rule:admin",
-    "admin": ["role:admin"],
-    "observer": ["role:observer"],
-    "creator": ["role:creator"],
-    "audit": ["rule:audit"],
-    "admin_or_user_does_not_work": ["project_id:%(project_id)s"],
-    "admin_or_user": ["role:admin", "project_id:%(project_id)s"],
-    "admin_or_creator": ["role:admin", "role:creator"],
-    "all_but_audit": ["role:admin", "role:observer", "role:creator"],
-    "all_users": ["role:admin", "role:observer", "role:creator", "role:audit"]
-}
\ No newline at end of file
+    "admin": "role:admin",
+    "observer": "role:observer",
+    "creator": "role:creator",
+    "audit": "rule:audit",
+    "admin_or_user_does_not_work": "project_id:%(project_id)s",
+    "admin_or_user": "role:admin or project_id:%(project_id)s",
+    "admin_or_creator": "role:admin or role:creator",
+    "all_but_audit": "role:admin or role:observer or role:creator",
+    "all_users": "role:admin or role:observer or role:creator or role:audit"
+}