Merge "Remove default override for config options policy_file"

This commit is contained in:
Zuul 2024-11-18 07:50:29 +00:00 committed by Gerrit Code Review
commit a6a89a6d4c
2 changed files with 1 additions and 5 deletions

View File

@ -20,14 +20,10 @@ from pecan import hooks
from aodh.api import policies from aodh.api import policies
# TODO(gmann): Remove overriding the default value of config options: # TODO(gmann): Remove overriding the default value of config options:
# - 'policy_file' once oslo_policy change their default value to what is
# overridden here.
# - 'enforce_scope', and 'enforce_new_defaults' once aodh is ready with the # - 'enforce_scope', and 'enforce_new_defaults' once aodh is ready with the
# new RBAC (oslo_policy enable them by default) # new RBAC (oslo_policy enable them by default)
DEFAULT_POLICY_FILE = 'policy.yaml'
opts.set_defaults( opts.set_defaults(
cfg.CONF, cfg.CONF,
DEFAULT_POLICY_FILE,
enforce_scope=False, enforce_scope=False,
enforce_new_defaults=False) enforce_new_defaults=False)

View File

@ -14,7 +14,7 @@ oslo.config>=6.8.0 # Apache-2.0
oslo.i18n>=1.5.0 # Apache-2.0 oslo.i18n>=1.5.0 # Apache-2.0
oslo.log>=4.3.0 # Apache-2.0 oslo.log>=4.3.0 # Apache-2.0
oslo.reports>=1.18.0 # Apache-2.0 oslo.reports>=1.18.0 # Apache-2.0
oslo.policy>=3.11.0 # Apache-2.0 oslo.policy>=4.5.0 # Apache-2.0
oslo.upgradecheck>=1.3.0 # Apache-2.0 oslo.upgradecheck>=1.3.0 # Apache-2.0
PasteDeploy>=1.5.0 # MIT PasteDeploy>=1.5.0 # MIT
pbr>=2.0.0 # Apache-2.0 pbr>=2.0.0 # Apache-2.0