Expose policy_default_rule

The option has been managed by the underlying puppet-oslo module but
has not been configurable. This introduces the parameter to customize
the option.

Change-Id: I8ab0d89ef49ac56b221c72fbbc93fc52c9d60b45
This commit is contained in:
Takashi Kajinami 2023-01-23 14:33:09 +09:00
parent 6d2eeafde1
commit 109965ac75
3 changed files with 12 additions and 0 deletions

View File

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

View File

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