From b4c0d0c59abaf50f284a2c7a797812af6249fd0c Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Sun, 10 Nov 2024 21:36:57 -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: I7d449554e777d2a6df126a7091e2bf9008ba465f
---
 requirements.txt       | 2 +-
 zaqar/transport/acl.py | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 353307e70..9133afb8d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -27,7 +27,7 @@ oslo.reports>=2.2.0 # Apache-2.0
 oslo.serialization>=4.2.0 # Apache-2.0
 oslo.upgradecheck>=1.3.0 # 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
 SQLAlchemy>=1.3.19 # MIT
 autobahn>=22.3.2 # MIT License
diff --git a/zaqar/transport/acl.py b/zaqar/transport/acl.py
index c92116fe2..e8fbafb18 100644
--- a/zaqar/transport/acl.py
+++ b/zaqar/transport/acl.py
@@ -16,20 +16,12 @@
 
 import functools
 
-from oslo_config import cfg
-from oslo_policy import opts
 from oslo_policy import policy
 
 from zaqar.common import policies
 
 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):
     global ENFORCER