openstack/cinder
Code Issues Proposed changes

Merge "Keep new RBAC disable by default"

Browse Source
This commit is contained in:
Zuul 2024-08-07 14:18:27 +00:00 committed by Gerrit Code Review
commit 383b830b92
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/common/config.py
View File

@ -257,4 +257,6 @@ def set_external_library_defaults():
# setup.cfg.
set_middleware_defaults()
policy_opts.set_defaults(CONF, policy_file=DEFAULT_POLICY_FILENAME)
policy_opts.set_defaults(CONF, policy_file=DEFAULT_POLICY_FILENAME,
enforce_scope=False,
enforce_new_defaults=False)

11
cinder/policy.py
View File

@ -32,8 +32,17 @@ from cinder import policies
CONF = cfg.CONF
LOG = logging.getLogger(__name__)
# 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
# new RBAC (oslo_policy enable them by default)
DEFAULT_POLICY_FILENAME = 'policy.yaml'
policy_opts.set_defaults(cfg.CONF, DEFAULT_POLICY_FILENAME)
policy_opts.set_defaults(
cfg.CONF,
DEFAULT_POLICY_FILENAME,
enforce_scope=False,
enforce_new_defaults=False)
_ENFORCER: Optional[policy.Enforcer] = None

2
requirements.txt
View File

@ -20,7 +20,7 @@ oslo.db>=11.0.0 # Apache-2.0
oslo.log>=4.6.1 # Apache-2.0
oslo.messaging>=14.1.0 # Apache-2.0
oslo.middleware>=4.1.1 # Apache-2.0
oslo.policy>=3.8.1 # Apache-2.0
oslo.policy>=3.11.0 # Apache-2.0
oslo.privsep>=2.6.2 # Apache-2.0
oslo.reports>=3.2.0 # Apache-2.0
oslo.rootwrap>=6.2.0 # Apache-2.0