From e71c19732ebeade352560b9c232e4a49388bac5a Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Sun, 10 Nov 2024 21:38:03 -0800
Subject: [PATCH] Remove default override for config options policy_file

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
---
 aodh/api/hooks.py | 4 ----
 requirements.txt  | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/aodh/api/hooks.py b/aodh/api/hooks.py
index 741a773be..69fe6e163 100644
--- a/aodh/api/hooks.py
+++ b/aodh/api/hooks.py
@@ -20,14 +20,10 @@ from pecan import hooks
 from aodh.api import policies
 
 # 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
 # new RBAC (oslo_policy enable them by default)
-DEFAULT_POLICY_FILE = 'policy.yaml'
 opts.set_defaults(
     cfg.CONF,
-    DEFAULT_POLICY_FILE,
     enforce_scope=False,
     enforce_new_defaults=False)
 
diff --git a/requirements.txt b/requirements.txt
index d5277ce40..4e7d89f91 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ oslo.config>=6.8.0 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0
 oslo.log>=4.3.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
 PasteDeploy>=1.5.0
 pbr>=2.0.0 # Apache-2.0