From 0ba0efa921e411ea309d22bf90d9b9535f9eea37 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Thu, 18 Mar 2021 20:57:27 +0900
Subject: [PATCH] Add support for oslo_policy/enforce_new_defaults

Depends-on: https://review.opendev.org/781428
Change-Id: Iae9098ac8a42c8371a817993d4450747a51ff6f8
---
 manifests/policy.pp                             | 17 ++++++++++++-----
 ...y-enforce_new_defaults-0499fab4ab2b5836.yaml |  5 +++++
 spec/classes/keystone_policy_spec.rb            | 12 +++++++-----
 3 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 releasenotes/notes/policy-enforce_new_defaults-0499fab4ab2b5836.yaml

diff --git a/manifests/policy.pp b/manifests/policy.pp
index c86989a1a..c090ab365 100644
--- a/manifests/policy.pp
+++ b/manifests/policy.pp
@@ -8,6 +8,11 @@
 #  (Optional) Whether or not to enforce scope when evaluating policies.
 #  Defaults to $::os_service_default.
 #
+# [*enforce_new_defaults*]
+#  (Optional) Whether or not to use old deprecated defaults when evaluating
+#  policies.
+#  Defaults to $::os_service_default.
+#
 # [*policies*]
 #   (Optional) Set of policies to configure for keystone
 #   Example :
@@ -28,9 +33,10 @@
 #   Defaults to /etc/keystone/policy.yaml
 #
 class keystone::policy (
-  $enforce_scope = $::os_service_default,
-  $policies      = {},
-  $policy_path   = '/etc/keystone/policy.yaml',
+  $enforce_scope        = $::os_service_default,
+  $enforce_new_defaults = $::os_service_default,
+  $policies             = {},
+  $policy_path          = '/etc/keystone/policy.yaml',
 ) {
 
   include keystone::deps
@@ -48,8 +54,9 @@ class keystone::policy (
   create_resources('openstacklib::policy::base', $policies)
 
   oslo::policy { 'keystone_config':
-    enforce_scope => $enforce_scope,
-    policy_file   => $policy_path
+    enforce_scope        => $enforce_scope,
+    enforce_new_defaults => $enforce_new_defaults,
+    policy_file          => $policy_path
   }
 
 }
diff --git a/releasenotes/notes/policy-enforce_new_defaults-0499fab4ab2b5836.yaml b/releasenotes/notes/policy-enforce_new_defaults-0499fab4ab2b5836.yaml
new file mode 100644
index 000000000..212be7c0d
--- /dev/null
+++ b/releasenotes/notes/policy-enforce_new_defaults-0499fab4ab2b5836.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The new ``keystone::policy::enforce_new_defaults`` parameter has been
+    added.
diff --git a/spec/classes/keystone_policy_spec.rb b/spec/classes/keystone_policy_spec.rb
index 1dafd9cde..08d2a3a9c 100644
--- a/spec/classes/keystone_policy_spec.rb
+++ b/spec/classes/keystone_policy_spec.rb
@@ -4,9 +4,10 @@ describe 'keystone::policy' do
   shared_examples 'keystone::policy' do
     let :params do
       {
-        :enforce_scope => false,
-        :policy_path   => '/etc/keystone/policy.yaml',
-        :policies      => {
+        :enforce_scope        => false,
+        :enforce_new_defaults => false,
+        :policy_path          => '/etc/keystone/policy.yaml',
+        :policies             => {
           'context_is_admin' => {
             'key'   => 'context_is_admin',
             'value' => 'foo:bar'
@@ -24,8 +25,9 @@ describe 'keystone::policy' do
         :file_format => 'yaml',
       })
       is_expected.to contain_oslo__policy('keystone_config').with(
-        :enforce_scope => false,
-        :policy_file   => '/etc/keystone/policy.yaml',
+        :enforce_scope        => false,
+        :enforce_new_defaults => false,
+        :policy_file          => '/etc/keystone/policy.yaml',
       )
     end
   end