Merge "Add support for oslo_policy/enforce_new_defaults"

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 :
@@ -29,6 +34,7 @@
 #
 class keystone::policy (
   $enforce_scope        = $::os_service_default,
+  $enforce_new_defaults = $::os_service_default,
   $policies             = {},
   $policy_path          = '/etc/keystone/policy.yaml',
 ) {
@@ -49,6 +55,7 @@ class keystone::policy (
 
   oslo::policy { 'keystone_config':
     enforce_scope        => $enforce_scope,
+    enforce_new_defaults => $enforce_new_defaults,
     policy_file          => $policy_path
   }
 

releasenotes/notes/policy-enforce_new_defaults-0499fab4ab2b5836.yaml

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

spec/classes/keystone_policy_spec.rb

@@ -5,6 +5,7 @@ describe 'keystone::policy' do
     let :params do
       {
         :enforce_scope        => false,
+        :enforce_new_defaults => false,
         :policy_path          => '/etc/keystone/policy.yaml',
         :policies             => {
           'context_is_admin' => {
@@ -25,6 +26,7 @@ describe 'keystone::policy' do
       })
       is_expected.to contain_oslo__policy('keystone_config').with(
         :enforce_scope        => false,
+        :enforce_new_defaults => false,
         :policy_file          => '/etc/keystone/policy.yaml',
       )
     end