Merge "Remove default override for config options policy_file"

This commit is contained in:
Zuul 2024-11-16 03:57:24 +00:00 committed by Gerrit Code Review
commit 59ec329624
2 changed files with 1 additions and 9 deletions

View File

@ -27,7 +27,7 @@ oslo.reports>=2.2.0 # Apache-2.0
oslo.serialization>=4.2.0 # Apache-2.0 oslo.serialization>=4.2.0 # Apache-2.0
oslo.upgradecheck>=1.3.0 # Apache-2.0 oslo.upgradecheck>=1.3.0 # Apache-2.0
oslo.utils>=4.12.1 # Apache-2.0 oslo.utils>=4.12.1 # Apache-2.0
oslo.policy>=3.8.1 # Apache-2.0 oslo.policy>=4.5.0 # Apache-2.0
osprofiler>=1.4.0 # Apache-2.0 osprofiler>=1.4.0 # Apache-2.0
SQLAlchemy>=1.3.19 # MIT SQLAlchemy>=1.3.19 # MIT
autobahn>=22.3.2 # MIT License autobahn>=22.3.2 # MIT License

View File

@ -16,20 +16,12 @@
import functools import functools
from oslo_config import cfg
from oslo_policy import opts
from oslo_policy import policy from oslo_policy import policy
from zaqar.common import policies from zaqar.common import policies
ENFORCER = None ENFORCER = None
# TODO(gmann): Remove setting the default value of config policy_file
# once oslo_policy change the default value to 'policy.yaml'.
# https://github.com/openstack/oslo.policy/blob/a626ad12fe5a3abd49d70e3e5b95589d279ab578/oslo_policy/opts.py#L49
DEFAULT_POLICY_FILE = 'policy.yaml'
opts.set_defaults(cfg.CONF, DEFAULT_POLICY_FILE)
def setup_policy(conf): def setup_policy(conf):
global ENFORCER global ENFORCER