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: I1d659cff49da01513236ab675ea678157975a124
This commit is contained in:
parent
204261f9f9
commit
0ed1be3ff3
@ -32,6 +32,10 @@
|
|||||||
# (Optional) Path to the neutron policy.yaml file
|
# (Optional) Path to the neutron policy.yaml file
|
||||||
# Defaults to /etc/neutron/policy.yaml
|
# Defaults to /etc/neutron/policy.yaml
|
||||||
#
|
#
|
||||||
|
# [*policy_default_rule*]
|
||||||
|
# (Optional) Default rule. Enforced when a requested rule is not found.
|
||||||
|
# Defaults to $::os_service_default.
|
||||||
|
#
|
||||||
# [*policy_dirs*]
|
# [*policy_dirs*]
|
||||||
# (Optional) Path to the neutron policy folder
|
# (Optional) Path to the neutron policy folder
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
@ -46,6 +50,7 @@ class neutron::policy (
|
|||||||
$enforce_new_defaults = $::os_service_default,
|
$enforce_new_defaults = $::os_service_default,
|
||||||
$policies = {},
|
$policies = {},
|
||||||
$policy_path = '/etc/neutron/policy.yaml',
|
$policy_path = '/etc/neutron/policy.yaml',
|
||||||
|
$policy_default_rule = $::os_service_default,
|
||||||
$policy_dirs = $::os_service_default,
|
$policy_dirs = $::os_service_default,
|
||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
) {
|
) {
|
||||||
@ -70,6 +75,7 @@ class neutron::policy (
|
|||||||
enforce_scope => $enforce_scope,
|
enforce_scope => $enforce_scope,
|
||||||
enforce_new_defaults => $enforce_new_defaults,
|
enforce_new_defaults => $enforce_new_defaults,
|
||||||
policy_file => $policy_path,
|
policy_file => $policy_path,
|
||||||
|
policy_default_rule => $policy_default_rule,
|
||||||
policy_dirs => $policy_dirs,
|
policy_dirs => $policy_dirs,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The new ``neutron::policy::policy_default_rule`` parameter has been added.
|
@ -9,6 +9,7 @@ describe 'neutron::policy' do
|
|||||||
:enforce_scope => false,
|
:enforce_scope => false,
|
||||||
:enforce_new_defaults => false,
|
:enforce_new_defaults => false,
|
||||||
:policy_path => '/etc/neutron/policy.yaml',
|
:policy_path => '/etc/neutron/policy.yaml',
|
||||||
|
:policy_default_rule => 'default',
|
||||||
:policy_dirs => '/etc/neutron/policy.d',
|
:policy_dirs => '/etc/neutron/policy.d',
|
||||||
:policies => {
|
:policies => {
|
||||||
'context_is_admin' => {
|
'context_is_admin' => {
|
||||||
@ -37,6 +38,7 @@ describe 'neutron::policy' do
|
|||||||
:enforce_scope => false,
|
:enforce_scope => false,
|
||||||
:enforce_new_defaults => false,
|
:enforce_new_defaults => false,
|
||||||
:policy_file => '/etc/neutron/policy.yaml',
|
:policy_file => '/etc/neutron/policy.yaml',
|
||||||
|
:policy_default_rule => 'default',
|
||||||
:policy_dirs => '/etc/neutron/policy.d',
|
:policy_dirs => '/etc/neutron/policy.d',
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user