diff --git a/requirements.txt b/requirements.txt index 2249fb2240..dd7784378a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -37,7 +37,7 @@ oslo.log>=3.36.0 # Apache-2.0 oslo.db>=4.27.0 # Apache-2.0 xmltodict>=0.10.1 # MIT cryptography>=2.1.4 # BSD/Apache-2.0 -oslo.policy>=3.6.0 # Apache-2.0 +oslo.policy>=4.5.0 # Apache-2.0 diskimage-builder!=1.6.0,!=1.7.0,!=1.7.1,>=1.1.2 # Apache-2.0 docker>=4.2.0 # Apache-2.0 psycopg2-binary>=2.6.2 # LGPL/ZPL diff --git a/trove/common/policy.py b/trove/common/policy.py index 1c9d795511..85e498b283 100644 --- a/trove/common/policy.py +++ b/trove/common/policy.py @@ -15,7 +15,6 @@ from oslo_config import cfg -from oslo_policy import opts from oslo_policy import policy from trove.common import exception as trove_exceptions @@ -25,12 +24,6 @@ from trove.common.policies import base CONF = cfg.CONF _ENFORCER = None -# 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 -DEFAULT_POLICY_FILE = 'policy.yaml' -opts.set_defaults(CONF, DEFAULT_POLICY_FILE) - def get_enforcer(): global _ENFORCER