Remove default override for config options policy_file

olso.policy 4.5.0[1] changed the config options policy_file
default value to 'policy.yaml', which means it is changed
for all the OpenStack services and they do not need to
override the default anymore.

NOTE: There is no change in behaviour here, oslo.policy provides
the same configuration that services have overridden till now.

[1] https://review.opendev.org/c/openstack/releases/+/934012
[2] https://review.opendev.org/c/openstack/requirements/+/934295

Change-Id: I60bc1bf949919b49887ad8de9c09e6e683a41626

Author: Ghanshyam Mann

magnum/common/config.py

@@ -16,7 +16,6 @@
 #    under the License.
 
 from oslo_middleware import cors
-from oslo_policy import opts
 
 from magnum.common import rpc
 import magnum.conf
@@ -44,11 +43,6 @@ def set_config_defaults():
     """
     set_cors_middleware_defaults()
 
-    # TODO(gmann): Remove setting the default value of config policy_file
-    # once oslo_policy change the default value to 'policy.yaml'.
-    # https://github.com/openstack/oslo.policy/blob/a626ad12fe5a3abd49d70e3e5b95589d279ab578/oslo_policy/opts.py#L49
-    opts.set_defaults(CONF, 'policy.yaml')
-
 
 def set_cors_middleware_defaults():
     """Update default configuration options for oslo.middleware."""

magnum/common/policy.py

@@ -18,7 +18,6 @@
 import decorator
 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 importutils
 import pecan
@@ -32,15 +31,6 @@
 _ENFORCER = None
 CONF = cfg.CONF
 
-# TODO(ricolin): Remove overriding the default value of config options
-# '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
-)
-
 
 # we can get a policy enforcer by this init.
 # oslo policy support change policy rule dynamically.

requirements.txt

@@ -23,7 +23,7 @@ oslo.i18n>=5.0.0 # Apache-2.0
 oslo.log>=4.8.0 # Apache-2.0
 oslo.messaging>=14.1.0 # Apache-2.0
 oslo.middleware>=4.1.0 # Apache-2.0
-oslo.policy>=4.4.0 # Apache-2.0
+oslo.policy>=4.5.0 # Apache-2.0
 oslo.reports>=2.1.0 # Apache-2.0
 oslo.serialization>=3.2.0 # Apache-2.0
 oslo.service>=2.2.0 # Apache-2.0