Merge "Remove default override for config options policy_file"

manila/common/config.py

@@ -29,7 +29,6 @@ import socket
 from oslo_config import cfg
 from oslo_log import log
 from oslo_middleware import cors
-from oslo_policy import opts as policy_opts
 from oslo_utils import netutils
 
 from manila.common import constants
@@ -207,5 +206,3 @@ def set_lib_defaults():
                        'DELETE',
                        'PATCH']
     )
-    # Update default value of oslo.policy policy_file config option.
-    policy_opts.set_defaults(CONF, 'policy.yaml')

manila/policy.py

@@ -20,7 +20,6 @@ import sys
 
 from oslo_config import cfg
 from oslo_log import log as logging
-from oslo_policy import opts
 from oslo_policy import policy
 from oslo_utils import excutils
 
@@ -32,16 +31,6 @@ LOG = logging.getLogger(__name__)
 _ENFORCER = None
 
 
-# TODO(gmann): Remove setting the default value of config policy_file
-# 'policy_file' once oslo_policy change its default value to what
-# is overridden here.
-DEFAULT_POLICY_FILE = 'policy.yaml'
-opts.set_defaults(CONF, DEFAULT_POLICY_FILE)
-opts.set_defaults(
-    cfg.CONF,
-    DEFAULT_POLICY_FILE)
-
-
 def reset():
     global _ENFORCER
     if _ENFORCER:

requirements.txt

@@ -18,7 +18,7 @@ oslo.i18n>=5.0.1 # Apache-2.0
 oslo.log>=4.4.0 # Apache-2.0
 oslo.messaging>=14.1.0 # Apache-2.0
 oslo.middleware>=4.1.1 # Apache-2.0
-oslo.policy>=4.4.0 # Apache-2.0
+oslo.policy>=4.5.0 # Apache-2.0
 oslo.privsep>=2.4.0 # Apache-2.0
 oslo.reports>=2.2.0 # Apache-2.0
 oslo.rootwrap>=6.2.0 # Apache-2.0