From 64cf6c13ccdd557066583fdad9c99fe6857d9716 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 21 Oct 2020 21:06:07 +0900
Subject: [PATCH] Add support for the oslo_policy/enforce_scope parameter

Depends-on: https://review.opendev.org/#/c/759008/
Change-Id: Ib54f3adbeb2eaa72b74bd8cadd81a468dbcc0321
---
 manifests/policy.pp                                | 14 +++++++++++---
 ...oslo_policy-enforce_scope-99b33bde5542e66d.yaml |  5 +++++
 spec/classes/keystone_policy_spec.rb               |  8 +++++---
 3 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 releasenotes/notes/oslo_policy-enforce_scope-99b33bde5542e66d.yaml

diff --git a/manifests/policy.pp b/manifests/policy.pp
index aa647967c..111b3ff56 100644
--- a/manifests/policy.pp
+++ b/manifests/policy.pp
@@ -4,6 +4,10 @@
 #
 # === Parameters
 #
+# [*enforce_scope*]
+#  (Optional) Whether or not to enforce scope when evaluating policies.
+#  Defaults to $::os_service_default.
+#
 # [*policies*]
 #   (Optional) Set of policies to configure for keystone
 #   Example :
@@ -24,8 +28,9 @@
 #   Defaults to /etc/keystone/policy.json
 #
 class keystone::policy (
-  $policies    = {},
-  $policy_path = '/etc/keystone/policy.json',
+  $enforce_scope = $::os_service_default,
+  $policies      = {},
+  $policy_path   = '/etc/keystone/policy.json',
 ) {
 
   include keystone::deps
@@ -41,6 +46,9 @@ class keystone::policy (
 
   create_resources('openstacklib::policy::base', $policies)
 
-  oslo::policy { 'keystone_config': policy_file => $policy_path }
+  oslo::policy { 'keystone_config':
+    enforce_scope => $enforce_scope,
+    policy_file   => $policy_path
+  }
 
 }
diff --git a/releasenotes/notes/oslo_policy-enforce_scope-99b33bde5542e66d.yaml b/releasenotes/notes/oslo_policy-enforce_scope-99b33bde5542e66d.yaml
new file mode 100644
index 000000000..c05f80445
--- /dev/null
+++ b/releasenotes/notes/oslo_policy-enforce_scope-99b33bde5542e66d.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The new ``keystone::policy::enforce_scope`` parameter has been added to
+    support the corresponding parameter in oslo.policy library.
diff --git a/spec/classes/keystone_policy_spec.rb b/spec/classes/keystone_policy_spec.rb
index 20f5e2d05..abcd6c0f2 100644
--- a/spec/classes/keystone_policy_spec.rb
+++ b/spec/classes/keystone_policy_spec.rb
@@ -4,8 +4,9 @@ describe 'keystone::policy' do
   shared_examples 'keystone::policy' do
     let :params do
       {
-        :policy_path => '/etc/keystone/policy.json',
-        :policies    => {
+        :enforce_scope => false,
+        :policy_path   => '/etc/keystone/policy.json',
+        :policies      => {
           'context_is_admin' => {
             'key'   => 'context_is_admin',
             'value' => 'foo:bar'
@@ -22,7 +23,8 @@ describe 'keystone::policy' do
         :file_group => 'keystone',
       })
       is_expected.to contain_oslo__policy('keystone_config').with(
-        :policy_file => '/etc/keystone/policy.json',
+        :enforce_scope => false,
+        :policy_file   => '/etc/keystone/policy.json',
       )
     end
   end