From 92d11d139e9f76d4fd76859aea78643fc32ef36b Mon Sep 17 00:00:00 2001 From: asteroide Date: Thu, 24 Sep 2015 16:27:16 +0200 Subject: Update Keystone code from repository. Change-Id: Ib3d0a06b10902fcc6d520f58e85aa617bc326d00 --- keystone-moon/keystone/policy/backends/rules.py | 2 +- keystone-moon/keystone/policy/core.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'keystone-moon/keystone/policy') diff --git a/keystone-moon/keystone/policy/backends/rules.py b/keystone-moon/keystone/policy/backends/rules.py index 011dd542..a4150575 100644 --- a/keystone-moon/keystone/policy/backends/rules.py +++ b/keystone-moon/keystone/policy/backends/rules.py @@ -69,7 +69,7 @@ def enforce(credentials, action, target, do_raise=True): return _ENFORCER.enforce(action, target, credentials, **extra) -class Policy(policy.Driver): +class Policy(policy.PolicyDriverV8): def enforce(self, credentials, action, target): LOG.debug('enforce %(action)s: %(credentials)s', { 'action': action, diff --git a/keystone-moon/keystone/policy/core.py b/keystone-moon/keystone/policy/core.py index 7943b59e..dfd6ff2d 100644 --- a/keystone-moon/keystone/policy/core.py +++ b/keystone-moon/keystone/policy/core.py @@ -82,7 +82,7 @@ class Manager(manager.Manager): @six.add_metaclass(abc.ABCMeta) -class Driver(object): +class PolicyDriverV8(object): def _get_list_limit(self): return CONF.policy.list_limit or CONF.list_limit @@ -136,3 +136,6 @@ class Driver(object): """ raise exception.NotImplemented() # pragma: no cover + + +Driver = manager.create_legacy_driver(PolicyDriverV8) -- cgit 1.2.3-korg