openstack/cinder
Code Issues Proposed changes

Merge "Remove default override for config options policy_file"

Browse Source
This commit is contained in:
Zuul 2024-11-21 21:14:58 +00:00 committed by Gerrit Code Review
commit 02fa643e8d
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/common/config.py
View File

@ -33,8 +33,6 @@ from oslo_middleware import cors
from oslo_policy import opts as policy_opts from oslo_policy import opts as policy_opts
from oslo_utils import netutils from oslo_utils import netutils
from cinder.policy import DEFAULT_POLICY_FILENAME
CONF = cfg.CONF CONF = cfg.CONF
logging.register_options(CONF) logging.register_options(CONF)
@ -257,6 +255,6 @@ def set_external_library_defaults():
# setup.cfg. # setup.cfg.
set_middleware_defaults() set_middleware_defaults()
policy_opts.set_defaults(CONF, policy_file=DEFAULT_POLICY_FILENAME, policy_opts.set_defaults(CONF,
enforce_scope=False, enforce_scope=False,
enforce_new_defaults=False) enforce_new_defaults=False)

3
cinder/policy.py
View File

@ -33,14 +33,11 @@ from cinder import policies
CONF = cfg.CONF CONF = cfg.CONF
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
# TODO(gmann): Remove overriding the default value of config options: # TODO(gmann): Remove overriding the default value of config options:
# - 'policy_file' once oslo_policy change their default value to what is
# overridden here.
# - 'enforce_scope', and 'enforce_new_defaults' once cinder is ready with the # - 'enforce_scope', and 'enforce_new_defaults' once cinder is ready with the
# new RBAC (oslo_policy enable them by default) # new RBAC (oslo_policy enable them by default)
DEFAULT_POLICY_FILENAME = 'policy.yaml' DEFAULT_POLICY_FILENAME = 'policy.yaml'
policy_opts.set_defaults( policy_opts.set_defaults(
cfg.CONF, cfg.CONF,
DEFAULT_POLICY_FILENAME,
enforce_scope=False, enforce_scope=False,
enforce_new_defaults=False) enforce_new_defaults=False)

2
requirements.txt
View File

@ -18,7 +18,7 @@ oslo.db>=11.0.0 # Apache-2.0
oslo.log>=4.6.1 # Apache-2.0 oslo.log>=4.6.1 # 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.11.0 # Apache-2.0 oslo.policy>=4.5.0 # Apache-2.0
oslo.privsep>=2.6.2 # Apache-2.0 oslo.privsep>=2.6.2 # Apache-2.0
oslo.reports>=3.2.0 # Apache-2.0 oslo.reports>=3.2.0 # Apache-2.0
oslo.rootwrap>=6.2.0 # Apache-2.0 oslo.rootwrap>=6.2.0 # Apache-2.0