From a5db89bd8854c97159f17e819abc0718e9c6d358 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Fri, 9 Aug 2024 11:59:07 -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 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
---
 magnum/common/policy.py | 8 +++-----
 requirements.txt        | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/magnum/common/policy.py b/magnum/common/policy.py
index 25cb3c7b39..c11afce864 100644
--- a/magnum/common/policy.py
+++ b/magnum/common/policy.py
@@ -33,14 +33,12 @@ _ENFORCER = None
 CONF = cfg.CONF
 
 # TODO(ricolin): Remove overriding the default value of config options
-# 'policy_file', 'enforce_scope', and 'enforce_new_defaults' once
-# oslo_policy change their default value to what is overridden here.
+# '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,
-    enforce_scope=True,
-    enforce_new_defaults=True
+    DEFAULT_POLICY_FILE
 )
 
 
diff --git a/requirements.txt b/requirements.txt
index dbeaa37797..c02ab2f98d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -30,7 +30,7 @@ oslo.i18n>=5.0.0 # Apache-2.0
 oslo.log>=4.8.0 # Apache-2.0
 oslo.messaging>=14.1.0 # Apache-2.0
 oslo.middleware>=4.1.0 # Apache-2.0
-oslo.policy>=3.11.0 # Apache-2.0
+oslo.policy>=4.4.0 # Apache-2.0
 oslo.reports>=2.1.0 # Apache-2.0
 oslo.serialization>=3.2.0 # Apache-2.0
 oslo.service>=2.2.0 # Apache-2.0