openstack/heat
Code Issues Proposed changes

Merge "Add entry_point for oslo policy scripts"

Browse Source
This commit is contained in:
Zuul 2019-04-22 08:58:02 +00:00 committed by Gerrit Code Review
commit 2d617cb44c
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
heat/common/policy.py
View File

@ -51,6 +51,8 @@ class Enforcer(object):
# register rules # register rules
self.enforcer.register_defaults(policies.list_rules()) self.enforcer.register_defaults(policies.list_rules())
self.file_rules = self.enforcer.file_rules
self.registered_rules = self.enforcer.registered_rules
def set_rules(self, rules, overwrite=True): def set_rules(self, rules, overwrite=True):
"""Create a new Rules object based on the provided dict of rules.""" """Create a new Rules object based on the provided dict of rules."""
@ -118,6 +120,13 @@ class Enforcer(object):
is_registered_policy=True) is_registered_policy=True)
def get_policy_enforcer():
# This method is used by oslopolicy CLI scripts to generate policy
# files from overrides on disk and defaults in code.
CONF([], project='heat')
return get_enforcer()
def get_enforcer(): def get_enforcer():
global ENFORCER global ENFORCER
if ENFORCER is None: if ENFORCER is None:

3
setup.cfg
View File

@ -60,6 +60,9 @@ oslo.config.opts =
oslo.config.opts.defaults = oslo.config.opts.defaults =
heat.common.config = heat.common.config:set_config_defaults heat.common.config = heat.common.config:set_config_defaults
oslo.policy.enforcer =
heat = heat.common.policy:get_policy_enforcer
oslo.policy.policies = oslo.policy.policies =
heat = heat.policies:list_rules heat = heat.policies:list_rules