From 4de74dd67f340e3637cd49e881e7aab4f8ef87fb Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Thu, 1 Apr 2021 22:18:03 +0200
Subject: [PATCH] Allow to configure policy_dirs

This patch makes it possible to override the current service default,
which is /etc/<service>/policy.d .

Change-Id: Ibf56bdd22ac741e8fd4a101214fc9f477ed3c132
---
 manifests/policy.pp                                  | 8 +++++++-
 releasenotes/notes/policy-dirs-454f7601815ff712.yaml | 5 +++++
 spec/classes/aodh_policy_spec.rb                     | 2 ++
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/policy-dirs-454f7601815ff712.yaml

diff --git a/manifests/policy.pp b/manifests/policy.pp
index 9fd2f772..39d4ef8e 100644
--- a/manifests/policy.pp
+++ b/manifests/policy.pp
@@ -32,11 +32,16 @@
 #   (Optional) Path to the aodh policy.yaml file
 #   Defaults to /etc/aodh/policy.yaml
 #
+# [*policy_dirs*]
+#   (Optional) Path to the aodh policy folder
+#   Defaults to $::os_service_default
+#
 class aodh::policy (
   $enforce_scope        = $::os_service_default,
   $enforce_new_defaults = $::os_service_default,
   $policies             = {},
   $policy_path          = '/etc/aodh/policy.yaml',
+  $policy_dirs          = $::os_service_default,
 ) {
 
   include aodh::deps
@@ -56,7 +61,8 @@ class aodh::policy (
   oslo::policy { 'aodh_config':
     enforce_scope        => $enforce_scope,
     enforce_new_defaults => $enforce_new_defaults,
-    policy_file          => $policy_path
+    policy_file          => $policy_path,
+    policy_dirs          => $policy_dirs,
   }
 
 }
diff --git a/releasenotes/notes/policy-dirs-454f7601815ff712.yaml b/releasenotes/notes/policy-dirs-454f7601815ff712.yaml
new file mode 100644
index 00000000..c84a3e94
--- /dev/null
+++ b/releasenotes/notes/policy-dirs-454f7601815ff712.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    There is now a new policy_dirs parameter in the aodh::policy class,
+    so one can set a custom path.
diff --git a/spec/classes/aodh_policy_spec.rb b/spec/classes/aodh_policy_spec.rb
index 3ea8bc0e..2b822dd9 100644
--- a/spec/classes/aodh_policy_spec.rb
+++ b/spec/classes/aodh_policy_spec.rb
@@ -7,6 +7,7 @@ describe 'aodh::policy' do
         :enforce_scope        => false,
         :enforce_new_defaults => false,
         :policy_path          => '/etc/aodh/policy.yaml',
+        :policy_dirs          => '/etc/aodh/policy.d',
         :policies             => {
           'context_is_admin' => {
             'key'   => 'context_is_admin',
@@ -28,6 +29,7 @@ describe 'aodh::policy' do
         :enforce_scope        => false,
         :enforce_new_defaults => false,
         :policy_file          => '/etc/aodh/policy.yaml',
+        :policy_dirs          => '/etc/aodh/policy.d',
       )
     end
   end