Merge pull request #1431 from kajinamit/policy-yaml

Remove default override for policy_file option
gnocchixyz · Dec 16, 2024 · 05995a1 · 05995a1
2 parents 1712a79 + 3c96c33
commit 05995a1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -33,7 +33,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