Skip to content

Commit 05995a1

Browse files
authored
Merge pull request #1431 from kajinamit/policy-yaml
Remove default override for policy_file option
2 parents 1712a79 + 3c96c33 commit 05995a1

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

gnocchi/cli/api.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import daiquiri
2323
from oslo_config import cfg
24-
from oslo_policy import opts as policy_opts
2524

2625
from gnocchi import opts
2726
from gnocchi.rest import app
@@ -37,7 +36,6 @@ def prepare_service(conf=None):
3736
conf = cfg.ConfigOpts()
3837

3938
opts.set_defaults()
40-
policy_opts.set_defaults(conf, 'policy.yaml')
4139

4240
conf = service.prepare_service(conf=conf)
4341
return conf

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ install_requires =
3333
numpy>=1.14.0
3434
iso8601
3535
oslo.config>=3.22.0
36-
oslo.policy>=3.5.0
36+
oslo.policy>=4.5.0
3737
oslo.middleware>=3.22.0
3838
oslo.utils>=1.1.1
3939
pytimeparse

0 commit comments

Comments
 (0)