Add support for the oslo_policy/enforce_scope parameter

Depends-on: https://review.opendev.org/#/c/759008/
Change-Id: Ic009641545dee5073bfa98cfdd1a01037cd316a4

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 gnocchi
 #   Example :
@@ -28,9 +32,10 @@
 #   Defaults to $::os_service_default
 #
 class gnocchi::policy (
-  $policies    = {},
-  $policy_path = '/etc/gnocchi/policy.yaml',
-  $policy_dirs = $::os_service_default,
+  $enforce_scope = $::os_service_default,
+  $policies      = {},
+  $policy_path   = '/etc/gnocchi/policy.yaml',
+  $policy_dirs   = $::os_service_default,
 ) {
 
   include gnocchi::deps
@@ -59,8 +64,9 @@ class gnocchi::policy (
   create_resources('openstacklib::policy::base', $policies)
 
   oslo::policy { 'gnocchi_config':
-    policy_file => $policy_path,
-    policy_dirs => $policy_dirs,
+    enforce_scope => $enforce_scope,
+    policy_file   => $policy_path,
+    policy_dirs   => $policy_dirs,
   }
 
 }

releasenotes/notes/oslo_policy-enforce_scope-3cf4ea69a6f5a91f.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The new ``gnocchi::policy::enforce_scope`` parameter has been added to
+    support the corresponding parameter in oslo.policy library.

spec/classes/gnocchi_policy_spec.rb

@@ -2,12 +2,13 @@ require 'spec_helper'
 
 describe 'gnocchi::policy' do
 
-  shared_examples_for 'gnocchi policies' do
+  shared_examples_for 'gnocchi::policy' do
     let :params do
       {
-        :policy_path => '/etc/gnocchi/policy.yaml',
-        :policy_dirs => '/etc/gnocchi/policy.d',
-        :policies    => {
+        :enforce_scope => false,
+        :policy_path   => '/etc/gnocchi/policy.yaml',
+        :policy_dirs   => '/etc/gnocchi/policy.d',
+        :policies      => {
           'context_is_admin' => {
             'key'   => 'context_is_admin',
             'value' => 'foo:bar'
@@ -25,8 +26,9 @@ describe 'gnocchi::policy' do
         :file_format => 'yaml',
       })
       is_expected.to contain_oslo__policy('gnocchi_config').with(
-        :policy_file => '/etc/gnocchi/policy.yaml',
-        :policy_dirs => '/etc/gnocchi/policy.d',
+        :enforce_scope => false,
+        :policy_file   => '/etc/gnocchi/policy.yaml',
+        :policy_dirs   => '/etc/gnocchi/policy.d',
       )
     end
   end
@@ -39,7 +41,7 @@ describe 'gnocchi::policy' do
         facts.merge!(OSDefaults.get_facts())
       end
 
-      it_configures 'gnocchi policies'
+      it_configures 'gnocchi::policy'
     end
   end
 end