openstack/ceilometer
Code Issues Proposed changes

Switch to oslo.policy 0.3.0

Browse Source 
Switch to the first official release of oslo.policy.

Change-Id: I72bc1450833db88ead2959d818d058fa64429c68
Closes-Bug: #1421863
This commit is contained in:
Lianhao Lu
2015-03-10 14:06:58 +08:00
parent 4d92fca455
commit 286d78b6b9
8 changed files with 16 additions and 973 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ceilometer/api/rbac.py
View File

@@ -16,12 +16,14 @@
"""Access Control Lists (ACL's) control access the API server."""
from oslo_config import cfg
from oslo_policy import policy
import pecan
from ceilometer.openstack.common import policy
_ENFORCER = None
CONF = cfg.CONF
def enforce(policy_name, request):
"""Return the user and project the request should be limited to.
@@ -33,7 +35,7 @@ def enforce(policy_name, request):
"""
global _ENFORCER
if not _ENFORCER:
_ENFORCER = policy.Enforcer()
_ENFORCER = policy.Enforcer(CONF)
_ENFORCER.load_rules()
rule_method = "telemetry:" + policy_name
@@ -67,7 +69,7 @@ def get_limited_to(headers):
"""
global _ENFORCER
if not _ENFORCER:
_ENFORCER = policy.Enforcer()
_ENFORCER = policy.Enforcer(CONF)
_ENFORCER.load_rules()
policy_dict = dict()