openstack/cloudkitty
Code Issues Proposed changes

Merge "Remove default override for config options policy_file"

Browse Source
This commit is contained in:
Zuul 2024-11-26 23:57:44 +00:00 committed by Gerrit Code Review
commit 8047e5d3dd
3 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cloudkitty/common/defaults.py
View File

@ -14,21 +14,13 @@
# #
from oslo_config import cfg
from oslo_middleware import cors from oslo_middleware import cors
from oslo_policy import opts as policy_opts
def set_config_defaults(): def set_config_defaults():
"""This method updates all configuration default values.""" """This method updates all configuration default values."""
set_cors_middleware_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
DEFAULT_POLICY_FILE = 'policy.yaml'
policy_opts.set_defaults(cfg.CONF, DEFAULT_POLICY_FILE)
def set_cors_middleware_defaults(): def set_cors_middleware_defaults():
"""Update default configuration options for oslo.middleware.""" """Update default configuration options for oslo.middleware."""

6
cloudkitty/common/policy.py
View File

@ -20,7 +20,6 @@ import sys
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
from oslo_policy import opts as policy_opts
from oslo_policy import policy from oslo_policy import policy
from oslo_utils import excutils from oslo_utils import excutils
@ -28,11 +27,6 @@ from cloudkitty.common import policies
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
CONF = cfg.CONF 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 _ENFORCER = None
# oslo_policy will read the policy configuration file again when the file # oslo_policy will read the policy configuration file again when the file

2
requirements.txt
View File

@ -20,7 +20,7 @@ oslo.i18n>=5.0.1 # Apache-2.0
oslo.log>=4.4.0 # Apache-2.0 oslo.log>=4.4.0 # Apache-2.0
oslo.messaging>=14.1.0 # Apache-2.0 oslo.messaging>=14.1.0 # Apache-2.0
oslo.middleware>=4.1.1 # 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.utils>=4.7.0 # Apache-2.0
oslo.upgradecheck>=1.3.0 # Apache-2.0 oslo.upgradecheck>=1.3.0 # Apache-2.0
python-dateutil>=2.8.0 # BSD python-dateutil>=2.8.0 # BSD