From 3381c5e82caae658cfa9f68b297cf2e2281bf190 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 24 Mar 2021 16:34:13 +0900
Subject: [PATCH] Add support for oslo_policy/enforce_new_defaults

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

diff --git a/manifests/policy.pp b/manifests/policy.pp
index 4871d3ae..ae9e8d7a 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 glance
 #   Example :
@@ -28,9 +33,10 @@
 #   Defaults to /etc/glance/policy.yaml
 #
 class glance::policy (
-  $enforce_scope = $::os_service_default,
-  $policies      = {},
-  $policy_path   = '/etc/glance/policy.yaml',
+  $enforce_scope        = $::os_service_default,
+  $enforce_new_defaults = $::os_service_default,
+  $policies             = {},
+  $policy_path          = '/etc/glance/policy.yaml',
 ) {
 
   include glance::deps
@@ -48,8 +54,9 @@ class glance::policy (
   create_resources('openstacklib::policy::base', $policies)
 
   oslo::policy { 'glance_api_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-239a805a6d0fba80.yaml b/releasenotes/notes/policy-enforce_new_defaults-239a805a6d0fba80.yaml
new file mode 100644
index 00000000..4e570833
--- /dev/null
+++ b/releasenotes/notes/policy-enforce_new_defaults-239a805a6d0fba80.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The new ``glance::policy::enforce_new_defaults`` parameter has been
+    added.
diff --git a/spec/classes/glance_policy_spec.rb b/spec/classes/glance_policy_spec.rb
index a012b25e..d3859151 100644
--- a/spec/classes/glance_policy_spec.rb
+++ b/spec/classes/glance_policy_spec.rb
@@ -4,9 +4,10 @@ describe 'glance::policy' do
   shared_examples 'glance::policy' do
     let :params do
       {
-        :enforce_scope => false,
-        :policy_path   => '/etc/glance/policy.yaml',
-        :policies      => {
+        :enforce_scope        => false,
+        :enforce_new_defaults => false,
+        :policy_path          => '/etc/glance/policy.yaml',
+        :policies             => {
           'context_is_admin' => {
             'key'   => 'context_is_admin',
             'value' => 'foo:bar'
@@ -24,8 +25,9 @@ describe 'glance::policy' do
         :file_format => 'yaml',
       })
       is_expected.to contain_oslo__policy('glance_api_config').with(
-        :enforce_scope => false,
-        :policy_file   => '/etc/glance/policy.yaml',
+        :enforce_scope        => false,
+        :enforce_new_defaults => false,
+        :policy_file          => '/etc/glance/policy.yaml',
       )
     end
   end