Browse Source

Merge "Allow to configure policy_dirs"

changes/90/785290/1
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
7f6cbb691a
3 changed files with 14 additions and 1 deletions
  1. +7
    -1
      manifests/policy.pp
  2. +5
    -0
      releasenotes/notes/policy-dirs-a4b2936cf9b39553.yaml
  3. +2
    -0
      spec/classes/sahara_policy_spec.rb

+ 7
- 1
manifests/policy.pp View File

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

+ 5
- 0
releasenotes/notes/policy-dirs-a4b2936cf9b39553.yaml View File

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

+ 2
- 0
spec/classes/sahara_policy_spec.rb View File

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


Loading…
Cancel
Save