Merge "Allow to configure policy_dirs"
This commit is contained in:
commit
11ea5a0ebd
|
@ -32,11 +32,16 @@
|
||||||
# (Optional) Path to the aodh policy.yaml file
|
# (Optional) Path to the aodh policy.yaml file
|
||||||
# Defaults to /etc/aodh/policy.yaml
|
# Defaults to /etc/aodh/policy.yaml
|
||||||
#
|
#
|
||||||
|
# [*policy_dirs*]
|
||||||
|
# (Optional) Path to the aodh policy folder
|
||||||
|
# Defaults to $::os_service_default
|
||||||
|
#
|
||||||
class aodh::policy (
|
class aodh::policy (
|
||||||
$enforce_scope = $::os_service_default,
|
$enforce_scope = $::os_service_default,
|
||||||
$enforce_new_defaults = $::os_service_default,
|
$enforce_new_defaults = $::os_service_default,
|
||||||
$policies = {},
|
$policies = {},
|
||||||
$policy_path = '/etc/aodh/policy.yaml',
|
$policy_path = '/etc/aodh/policy.yaml',
|
||||||
|
$policy_dirs = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include aodh::deps
|
include aodh::deps
|
||||||
|
@ -56,7 +61,8 @@ class aodh::policy (
|
||||||
oslo::policy { 'aodh_config':
|
oslo::policy { 'aodh_config':
|
||||||
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_dirs => $policy_dirs,
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
There is now a new policy_dirs parameter in the aodh::policy class,
|
||||||
|
so one can set a custom path.
|
|
@ -7,6 +7,7 @@ describe 'aodh::policy' do
|
||||||
:enforce_scope => false,
|
:enforce_scope => false,
|
||||||
:enforce_new_defaults => false,
|
:enforce_new_defaults => false,
|
||||||
:policy_path => '/etc/aodh/policy.yaml',
|
:policy_path => '/etc/aodh/policy.yaml',
|
||||||
|
:policy_dirs => '/etc/aodh/policy.d',
|
||||||
:policies => {
|
:policies => {
|
||||||
'context_is_admin' => {
|
'context_is_admin' => {
|
||||||
'key' => 'context_is_admin',
|
'key' => 'context_is_admin',
|
||||||
|
@ -28,6 +29,7 @@ describe 'aodh::policy' do
|
||||||
:enforce_scope => false,
|
:enforce_scope => false,
|
||||||
:enforce_new_defaults => false,
|
:enforce_new_defaults => false,
|
||||||
:policy_file => '/etc/aodh/policy.yaml',
|
:policy_file => '/etc/aodh/policy.yaml',
|
||||||
|
:policy_dirs => '/etc/aodh/policy.d',
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue