Add support for oslo_policy/enforce_new_defaults

Depends-on: https://review.opendev.org/781428
Change-Id: I2cfa1267b08ea432a8bf3245ebb57abc5fadb809

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 gnocchi
 #   Example :
@@ -24,7 +29,7 @@
 #   Defaults to empty hash.
 #
 # [*policy_path*]
-#   (Optional) Path to the nova policy.yaml file
+#   (Optional) Path to the gnocchi policy.yaml file
 #   Defaults to /etc/gnocchi/policy.yaml
 #
 # [*policy_dirs*]
@@ -32,10 +37,11 @@
 #   Defaults to $::os_service_default
 #
 class gnocchi::policy (
-  $enforce_scope = $::os_service_default,
+  $enforce_scope        = $::os_service_default,
-  $policies      = {},
+  $enforce_new_defaults = $::os_service_default,
-  $policy_path   = '/etc/gnocchi/policy.yaml',
+  $policies             = {},
-  $policy_dirs   = $::os_service_default,
+  $policy_path          = '/etc/gnocchi/policy.yaml',
+  $policy_dirs          = $::os_service_default,
 ) {
 
   include gnocchi::deps
@@ -64,9 +70,10 @@ class gnocchi::policy (
   create_resources('openstacklib::policy::base', $policies)
 
   oslo::policy { 'gnocchi_config':
-    enforce_scope => $enforce_scope,
+    enforce_scope        => $enforce_scope,
-    policy_file   => $policy_path,
+    enforce_new_defaults => $enforce_new_defaults,
-    policy_dirs   => $policy_dirs,
+    policy_file          => $policy_path,
+    policy_dirs          => $policy_dirs,
   }
 
 }

releasenotes/notes/policy-enforce_new_defaults-f33654b6eb02c4f2.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The new ``gnocchi::policy::enforce_new_defaults`` parameter has been
+    added.

spec/classes/gnocchi_policy_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
 describe 'gnocchi::policy' do
-
+  shared_examples 'gnocchi::policy' do
-  shared_examples_for 'gnocchi::policy' do
     let :params do
       {
-        :enforce_scope => false,
+        :enforce_scope        => false,
-        :policy_path   => '/etc/gnocchi/policy.yaml',
+        :enforce_new_defaults => false,
-        :policy_dirs   => '/etc/gnocchi/policy.d',
+        :policy_path          => '/etc/gnocchi/policy.yaml',
-        :policies      => {
+        :policy_dirs          => '/etc/gnocchi/policy.d',
+        :policies             => {
           'context_is_admin' => {
             'key'   => 'context_is_admin',
             'value' => 'foo:bar'
@@ -26,22 +26,23 @@ describe 'gnocchi::policy' do
         :file_format => 'yaml',
       })
       is_expected.to contain_oslo__policy('gnocchi_config').with(
-        :enforce_scope => false,
+        :enforce_scope        => false,
-        :policy_file   => '/etc/gnocchi/policy.yaml',
+        :enforce_new_defaults => false,
-        :policy_dirs   => '/etc/gnocchi/policy.d',
+        :policy_file          => '/etc/gnocchi/policy.yaml',
+        :policy_dirs          => '/etc/gnocchi/policy.d',
       )
     end
   end
 
   on_supported_os({
-    :supported_os   => OSDefaults.get_supported_os
+    :supported_os => OSDefaults.get_supported_os
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
         facts.merge!(OSDefaults.get_facts())
       end
 
-      it_configures 'gnocchi::policy'
+      it_behaves_like 'gnocchi::policy'
     end
   end
 end