From 3c96c33e6b896c16f550d1e17052456bdc4d7b48 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Mon, 11 Nov 2024 16:10:02 +0900
Subject: [PATCH] Remove default override for policy_file option

oslo.policy 4.5.0[1] changed the default value of [oslo_policy]
policy_file to use yaml file by default.

[1] https://opendev.org/openstack/oslo.policy/commit/26b04a4a803b21f8dc5ea7e3bc6ca76bf3144cfc
---
 gnocchi/cli/api.py | 2 --
 setup.cfg          | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnocchi/cli/api.py b/gnocchi/cli/api.py
index 4ea8784a2..7d2f709c3 100644
--- a/gnocchi/cli/api.py
+++ b/gnocchi/cli/api.py
@@ -21,7 +21,6 @@
 
 import daiquiri
 from oslo_config import cfg
-from oslo_policy import opts as policy_opts
 
 from gnocchi import opts
 from gnocchi.rest import app
@@ -37,7 +36,6 @@ def prepare_service(conf=None):
         conf = cfg.ConfigOpts()
 
     opts.set_defaults()
-    policy_opts.set_defaults(conf, 'policy.yaml')
 
     conf = service.prepare_service(conf=conf)
     return conf
diff --git a/setup.cfg b/setup.cfg
index 40492e6da..679ce8424 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -32,7 +32,7 @@ install_requires =
     numpy>=1.14.0
     iso8601
     oslo.config>=3.22.0
-    oslo.policy>=3.5.0
+    oslo.policy>=4.5.0
     oslo.middleware>=3.22.0
     oslo.utils>=1.1.1
     pytimeparse