From 7a6db095144d352d2faab4d336fb1ec504bb9787 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 23 Jan 2023 14:17:42 +0900
Subject: [PATCH] Expose policy_default_rule

The option has been managed by the underlying puppet-oslo module but
has not been configurable. This introduces the parameter to customize
the option.

Change-Id: I3db527e335f76f91eaad48fbd782878299b4b979
---
 manifests/policy.pp                                         | 6 ++++++
 .../notes/policy_default_rule-91ea720f662c95ce.yaml         | 4 ++++
 spec/classes/cinder_policy_spec.rb                          | 2 ++
 3 files changed, 12 insertions(+)
 create mode 100644 releasenotes/notes/policy_default_rule-91ea720f662c95ce.yaml

diff --git a/manifests/policy.pp b/manifests/policy.pp
index fff89ab4..48827100 100644
--- a/manifests/policy.pp
+++ b/manifests/policy.pp
@@ -32,6 +32,10 @@
 #   (Optional) Path to the cinder policy.yaml file
 #   Defaults to /etc/cinder/policy.yaml
 #
+# [*policy_default_rule*]
+#   (Optional) Default rule. Enforced when a requested rule is not found.
+#   Defaults to $::os_service_default.
+#
 # [*policy_dirs*]
 #   (Optional) Path to the cinder policy folder
 #   Defaults to $::os_service_default
@@ -46,6 +50,7 @@ class cinder::policy (
   $enforce_new_defaults = $::os_service_default,
   $policies             = {},
   $policy_path          = '/etc/cinder/policy.yaml',
+  $policy_default_rule  = $::os_service_default,
   $policy_dirs          = $::os_service_default,
   $purge_config         = false,
 ) {
@@ -70,6 +75,7 @@ class cinder::policy (
     enforce_scope        => $enforce_scope,
     enforce_new_defaults => $enforce_new_defaults,
     policy_file          => $policy_path,
+    policy_default_rule  => $policy_default_rule,
     policy_dirs          => $policy_dirs,
   }
 
diff --git a/releasenotes/notes/policy_default_rule-91ea720f662c95ce.yaml b/releasenotes/notes/policy_default_rule-91ea720f662c95ce.yaml
new file mode 100644
index 00000000..5141abb2
--- /dev/null
+++ b/releasenotes/notes/policy_default_rule-91ea720f662c95ce.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    The new ``cinder::policy::policy_default_rule`` parameter has been added.
diff --git a/spec/classes/cinder_policy_spec.rb b/spec/classes/cinder_policy_spec.rb
index 3195bd0d..5c8c2a02 100644
--- a/spec/classes/cinder_policy_spec.rb
+++ b/spec/classes/cinder_policy_spec.rb
@@ -9,6 +9,7 @@ describe 'cinder::policy' do
           :enforce_scope        => false,
           :enforce_new_defaults => false,
           :policy_path          => '/etc/cinder/policy.yaml',
+          :policy_default_rule  => 'default',
           :policy_dirs          => '/etc/cinder/policy.d',
           :policies             => {
             'context_is_admin' => {
@@ -37,6 +38,7 @@ describe 'cinder::policy' do
           :enforce_scope        => false,
           :enforce_new_defaults => false,
           :policy_file          => '/etc/cinder/policy.yaml',
+          :policy_default_rule  => 'default',
           :policy_dirs          => '/etc/cinder/policy.d',
         )
       end