diff --git a/cloudkitty/common/defaults.py b/cloudkitty/common/defaults.py index 376f3f61..1b9c0636 100644 --- a/cloudkitty/common/defaults.py +++ b/cloudkitty/common/defaults.py @@ -14,21 +14,13 @@ # -from oslo_config import cfg from oslo_middleware import cors -from oslo_policy import opts as policy_opts def set_config_defaults(): """This method updates all configuration default values.""" 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 - DEFAULT_POLICY_FILE = 'policy.yaml' - policy_opts.set_defaults(cfg.CONF, DEFAULT_POLICY_FILE) - def set_cors_middleware_defaults(): """Update default configuration options for oslo.middleware.""" diff --git a/cloudkitty/common/policy.py b/cloudkitty/common/policy.py index 9d55e1f8..3dcd5c5e 100644 --- a/cloudkitty/common/policy.py +++ b/cloudkitty/common/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 as policy_opts from oslo_policy import policy from oslo_utils import excutils @@ -28,11 +27,6 @@ from cloudkitty.common import policies LOG = logging.getLogger(__name__) CONF = cfg.CONF -# 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' -policy_opts.set_defaults(cfg.CONF, DEFAULT_POLICY_FILE) _ENFORCER = None # oslo_policy will read the policy configuration file again when the file diff --git a/requirements.txt b/requirements.txt index dd52840d..4870db55 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,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>=3.6.0 # Apache-2.0 +oslo.policy>=4.5.0 # Apache-2.0 oslo.utils>=4.7.0 # Apache-2.0 oslo.upgradecheck>=1.3.0 # Apache-2.0 python-dateutil>=2.8.0 # BSD