Skip to content

Commit a5db89b

Browse files
author
Ghanshyam Mann
committed
Remove default override for RBAC config options
RBAC config options enforce_scope and enforce_new_defaults were disabled by default in oslo.policy and Magnum had to override the default value to enable those by default. Now oslo.policy (4.4.0 onwards[1]) changed the default values[2] and enabled by default for all the services. OpenStack service does not need to override the default anymore. NOTE: There is no change in behaviour here, oslo.policy provides the same configuration that Magnum has overridden till now. [1] https://review.opendev.org/c/openstack/releases/+/925032 [2] https://review.opendev.org/c/openstack/oslo.policy/+/924283 Depends-On: https://review.opendev.org/c/openstack/requirements/+/925464 Change-Id: Ifed33f4c5a687e299b64344661a8d51a843457a3
1 parent 8d09169 commit a5db89b

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

magnum/common/policy.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,12 @@
3333
CONF = cfg.CONF
3434

3535
# TODO(ricolin): Remove overriding the default value of config options
36-
# 'policy_file', 'enforce_scope', and 'enforce_new_defaults' once
37-
# oslo_policy change their default value to what is overridden here.
36+
# 'policy_file' once oslo_policy change its default value to what
37+
# is overridden here.
3838
DEFAULT_POLICY_FILE = 'policy.yaml'
3939
opts.set_defaults(
4040
CONF,
41-
DEFAULT_POLICY_FILE,
42-
enforce_scope=True,
43-
enforce_new_defaults=True
41+
DEFAULT_POLICY_FILE
4442
)
4543

4644

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ oslo.i18n>=5.0.0 # Apache-2.0
3030
oslo.log>=4.8.0 # Apache-2.0
3131
oslo.messaging>=14.1.0 # Apache-2.0
3232
oslo.middleware>=4.1.0 # Apache-2.0
33-
oslo.policy>=3.11.0 # Apache-2.0
33+
oslo.policy>=4.4.0 # Apache-2.0
3434
oslo.reports>=2.1.0 # Apache-2.0
3535
oslo.serialization>=3.2.0 # Apache-2.0
3636
oslo.service>=2.2.0 # Apache-2.0

0 commit comments

Comments
 (0)