Allow to configure policy_dirs

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

Change-Id: Ifdf0f0808789fc82a8f53307c3c7e7676cbdc4b1
This commit is contained in:
Thomas Goirand 2021-03-23 09:24:03 +01:00 committed by Takashi Kajinami
parent a2ae2390b1
commit 1fe0e6b320
3 changed files with 14 additions and 1 deletions

View File

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

View File

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

View File

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