Merge "Expose policy_default_rule"

This commit is contained in:
Zuul 2023-01-24 18:29:01 +00:00 committed by Gerrit Code Review
commit 7b51c9178a
3 changed files with 12 additions and 0 deletions

View File

@ -32,6 +32,10 @@
# (Optional) Path to the keystone policy.yaml file
# Defaults to /etc/keystone/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 keystone policy folder
# Defaults to $::os_service_default
@ -46,6 +50,7 @@ class keystone::policy (
$enforce_new_defaults = $::os_service_default,
$policies = {},
$policy_path = '/etc/keystone/policy.yaml',
$policy_default_rule = $::os_service_default,
$policy_dirs = $::os_service_default,
$purge_config = false,
) {
@ -70,6 +75,7 @@ class keystone::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,
}

View File

@ -0,0 +1,4 @@
---
features:
- |
The new ``keystone::policy::policy_default_rule`` parameter has been added.

View File

@ -9,6 +9,7 @@ describe 'keystone::policy' do
:enforce_scope => false,
:enforce_new_defaults => false,
:policy_path => '/etc/keystone/policy.yaml',
:policy_default_rule => 'default',
:policy_dirs => '/etc/keystone/policy.d',
:policies => {
'context_is_admin' => {
@ -37,6 +38,7 @@ describe 'keystone::policy' do
:enforce_scope => false,
:enforce_new_defaults => false,
:policy_file => '/etc/keystone/policy.yaml',
:policy_default_rule => 'default',
:policy_dirs => '/etc/keystone/policy.d',
)
end