Add support for oslo_policy/enforce_new_defaults

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

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 ec2api
 #   Example :
@@ -28,9 +33,10 @@
 #   Defaults to /etc/ec2api/policy.yaml
 #
 class ec2api::policy (
-  $enforce_scope = $::os_service_default,
-  $policies      = {},
-  $policy_path   = '/etc/ec2api/policy.yaml',
+  $enforce_scope        = $::os_service_default,
+  $enforce_new_defaults = $::os_service_default,
+  $policies             = {},
+  $policy_path          = '/etc/ec2api/policy.yaml',
 ) {
 
   include ec2api::deps
@@ -48,8 +54,9 @@ class ec2api::policy (
   create_resources('openstacklib::policy::base', $policies)
 
   oslo::policy { 'ec2api_config':
-    enforce_scope => $enforce_scope,
-    policy_file   => $policy_path
+    enforce_scope        => $enforce_scope,
+    enforce_new_defaults => $enforce_new_defaults,
+    policy_file          => $policy_path
   }
 
 }

releasenotes/notes/policy-enforce_new_defaults-45a0a649e3169556.yaml

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

spec/classes/ec2api_policy_spec.rb

@@ -4,9 +4,10 @@ describe 'ec2api::policy' do
   shared_examples 'ec2api::policy' do
     let :params do
       {
-        :enforce_scope => false,
-        :policy_path   => '/etc/ec2api/policy.yaml',
-        :policies      => {
+        :enforce_scope        => false,
+        :enforce_new_defaults => false,
+        :policy_path          => '/etc/ec2api/policy.yaml',
+        :policies             => {
           'context_is_admin' => {
             'key'   => 'context_is_admin',
             'value' => 'foo:bar'
@@ -24,8 +25,9 @@ describe 'ec2api::policy' do
         :file_format => 'yaml',
       })
       is_expected.to contain_oslo__policy('ec2api_config').with(
-        :enforce_scope => false,
-        :policy_file   => '/etc/ec2api/policy.yaml',
+        :enforce_scope        => false,
+        :enforce_new_defaults => false,
+        :policy_file          => '/etc/ec2api/policy.yaml',
       )
     end
   end