openstack/aodh
Code Issues Proposed changes

Remove default override for config options policy_file

Browse Source 
olso.policy 4.5.0[1] changed the config options policy_file
default value to 'policy.yaml', which means it is changed
for all the OpenStack services and they do not need to
override the default anymore.

NOTE: There is no change in behaviour here, oslo.policy provides
the same configuration that services have overridden till now.

[1] https://review.opendev.org/c/openstack/releases/+/934012
[2] https://review.opendev.org/c/openstack/requirements/+/934295

Change-Id: Iba548429fefef53d043d42de4d12554d77e4591a
This commit is contained in:
Ghanshyam Mann 2024-11-10 21:38:03 -08:00
parent 1980cc84d2
commit e71c19732e
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
aodh/api/hooks.py
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)

2
requirements.txt
View File

@ -10,7 +10,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 PasteDeploy>=1.5.0
pbr>=2.0.0 # Apache-2.0 pbr>=2.0.0 # Apache-2.0