Skip to content

Commit

Permalink
Remove default override for policy_file option
Browse files Browse the repository at this point in the history
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
  • Loading branch information
kajinamit committed Nov 11, 2024
1 parent 5cc26b8 commit 3c96c33
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions gnocchi/cli/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3c96c33

Please sign in to comment.