summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authortermie <github@anarkystic.com>2012-02-28 16:50:48 -0800
committertermie <github@anarkystic.com>2012-03-08 14:06:32 -0800
commita2f2274c69df2ca5b040a69173f3eb7eb030c561 (patch)
treec57294737b6fe1bda4706d95e08863d4f81c958e /etc
parente5254d48b133f3ec9798cc8eb48a03cb69ff2d97 (diff)
port common policy code to keystone
keystone.common.policy is copied from nova leave simple backend in as a shim until devstack stops referencing it Change-Id: Ibd579cfeb99465706d525b6565818a2d8f5f3b7c
Diffstat (limited to 'etc')
-rw-r--r--etc/keystone.conf2
-rw-r--r--etc/policy.json3
2 files changed, 4 insertions, 1 deletions
diff --git a/etc/keystone.conf b/etc/keystone.conf
index 8665e620..4e207619 100644
--- a/etc/keystone.conf
+++ b/etc/keystone.conf
@@ -47,7 +47,7 @@ driver = keystone.token.backends.kvs.Token
expiration = 86400
[policy]
-driver = keystone.policy.backends.simple.SimpleMatch
+driver = keystone.policy.backends.rules.Policy
[ec2]
driver = keystone.contrib.ec2.backends.kvs.Ec2
diff --git a/etc/policy.json b/etc/policy.json
new file mode 100644
index 00000000..4a1482f8
--- /dev/null
+++ b/etc/policy.json
@@ -0,0 +1,3 @@
+{
+ "admin_required": [["role:admin"], ["is_admin:1"]]
+}