Merge pull request #1272 from tobias-urdin/revert

Revert "Fix incomplete switch to policy.yaml"
gnocchixyz · Sep 6, 2022 · 33a8100 · 33a8100
2 parents cb866ee + 7b722cc
commit 33a8100
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/gnocchi/cli/api.py b/gnocchi/cli/api.py
@@ -37,7 +37,7 @@ def prepare_service(conf=None):
         conf = cfg.ConfigOpts()
 
     opts.set_defaults()
-    policy_opts.set_defaults(conf, 'policy.yaml')
+    policy_opts.set_defaults(conf)
     conf = service.prepare_service(conf=conf)
     cfg_path = conf.oslo_policy.policy_file
     if not os.path.isabs(cfg_path):

diff --git a/setup.cfg b/setup.cfg
@@ -31,7 +31,7 @@ install_requires =
     numpy>=1.9.0
     iso8601
     oslo.config>=3.22.0
-    oslo.policy>=3.11.0
+    oslo.policy>=1.7.0
     oslo.middleware>=3.22.0
     pytimeparse
     pecan>=0.9