Merge "Allow to configure policy_dirs"

manifests/policy.pp

@@ -32,11 +32,16 @@
 #   (Optional) Path to the manila policy.yaml file
 #   Defaults to /etc/manila/policy.yaml
 #
+# [*policy_dirs*]
+#   (Optional) Path to the manila policy folder
+#   Defaults to $::os_service_default
+#
 class manila::policy (
   $enforce_scope        = $::os_service_default,
   $enforce_new_defaults = $::os_service_default,
   $policies             = {},
   $policy_path          = '/etc/manila/policy.yaml',
+  $policy_dirs          = $::os_service_default,
 ) {
 
   include manila::deps
@@ -56,7 +61,8 @@ class manila::policy (
   oslo::policy { 'manila_config':
     enforce_scope        => $enforce_scope,
     enforce_new_defaults => $enforce_new_defaults,
-    policy_file          => $policy_path
+    policy_file          => $policy_path,
+    policy_dirs          => $policy_dirs,
   }
 
 }

releasenotes/notes/policy-dirs-894617eebc2b8b8c.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    There is now a new policy_dirs parameter in the manila::policy class,
+    so one can set a custom path.

spec/classes/manila_policy_spec.rb

@@ -7,6 +7,7 @@ describe 'manila::policy' do
         :enforce_scope        => false,
         :enforce_new_defaults => false,
         :policy_path          => '/etc/manila/policy.yaml',
+        :policy_dirs          => '/etc/manila/policy.d',
         :policies             => {
           'context_is_admin' => {
             'key'   => 'context_is_admin',
@@ -28,6 +29,7 @@ describe 'manila::policy' do
         :enforce_scope        => false,
         :enforce_new_defaults => false,
         :policy_file          => '/etc/manila/policy.yaml',
+        :policy_dirs          => '/etc/manila/policy.d',
       )
     end
   end