diff options
| author | Zuul <zuul@review.opendev.org> | 2019-07-26 16:06:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-07-26 16:06:15 +0000 |
| commit | cf61a26f22b716711c5064e23da89179ccc28d18 (patch) | |
| tree | 93c5daa29837623c158aee62a36893c4b0546b5a | |
| parent | c4c7f1a707c3d9920313e02707a6fe0c3080ae1b (diff) | |
| parent | 7120d18b502865470cde879bc801274c47157355 (diff) | |
| download | heat-cf61a26f22b716711c5064e23da89179ccc28d18.tar.gz | |
Merge "Add entry_point for oslo policy scripts" into stable/rocky
| -rw-r--r-- | heat/common/policy.py | 9 | ||||
| -rw-r--r-- | setup.cfg | 3 |
2 files changed, 12 insertions, 0 deletions
diff --git a/heat/common/policy.py b/heat/common/policy.py index 4707c9673..312608c93 100644 --- a/heat/common/policy.py +++ b/heat/common/policy.py @@ -51,6 +51,8 @@ class Enforcer(object): # register 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): """Create a new Rules object based on the provided dict of rules.""" @@ -118,6 +120,13 @@ class Enforcer(object): 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(): global ENFORCER if ENFORCER is None: @@ -59,6 +59,9 @@ oslo.config.opts = oslo.config.opts.defaults = heat.common.config = heat.common.config:set_config_defaults +oslo.policy.enforcer = + heat = heat.common.policy:get_policy_enforcer + oslo.policy.policies = heat = heat.policies:list_rules |