From 503d7dfc61c6410a9d97c42c4d60ea54aa82e642 Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Fri, 9 Aug 2024 11:59:21 -0700 Subject: [PATCH] Remove default override for RBAC config options RBAC config options enforce_scope and enforce_new_defaults were disabled by default in oslo.policy and Manila 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 Manila 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: I1480dc81f1395989278852a9f215d90a90455cbb --- manila/policy.py | 8 +++----- requirements.txt | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/manila/policy.py b/manila/policy.py index a551404f1f..7ff0f72d71 100644 --- a/manila/policy.py +++ b/manila/policy.py @@ -33,15 +33,13 @@ _ENFORCER = None # 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 +# 'policy_file' once oslo_policy change its default value to what +# is overridden here. DEFAULT_POLICY_FILE = 'policy.yaml' opts.set_defaults(CONF, DEFAULT_POLICY_FILE) opts.set_defaults( cfg.CONF, - DEFAULT_POLICY_FILE, - enforce_scope=True, - enforce_new_defaults=True) + DEFAULT_POLICY_FILE) def reset(): diff --git a/requirements.txt b/requirements.txt index ecc6865354..e0c5f83199 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,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.11.0 # Apache-2.0 +oslo.policy>=4.4.0 # Apache-2.0 oslo.privsep>=2.4.0 # Apache-2.0 oslo.reports>=2.2.0 # Apache-2.0 oslo.rootwrap>=6.2.0 # Apache-2.0