Add support for oslo_policy/enforce_new_defaults
Depends-on: https://review.opendev.org/781428 Change-Id: I64511ee42f7b88e1721bb4b6b963f6ea198dcbd7
This commit is contained in:
parent
705447d107
commit
e11edd487c
@ -8,6 +8,11 @@
|
||||
# (Optional) Whether or not to enforce scope when evaluating policies.
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*enforce_new_defaults*]
|
||||
# (Optional) Whether or not to use old deprecated defaults when evaluating
|
||||
# policies.
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*policies*]
|
||||
# (Optional) Set of policies to configure for aodh
|
||||
# Example :
|
||||
@ -28,9 +33,10 @@
|
||||
# Defaults to /etc/aodh/policy.yaml
|
||||
#
|
||||
class aodh::policy (
|
||||
$enforce_scope = $::os_service_default,
|
||||
$policies = {},
|
||||
$policy_path = '/etc/aodh/policy.yaml',
|
||||
$enforce_scope = $::os_service_default,
|
||||
$enforce_new_defaults = $::os_service_default,
|
||||
$policies = {},
|
||||
$policy_path = '/etc/aodh/policy.yaml',
|
||||
) {
|
||||
|
||||
include aodh::deps
|
||||
@ -48,8 +54,9 @@ class aodh::policy (
|
||||
create_resources('openstacklib::policy::base', $policies)
|
||||
|
||||
oslo::policy { 'aodh_config':
|
||||
enforce_scope => $enforce_scope,
|
||||
policy_file => $policy_path
|
||||
enforce_scope => $enforce_scope,
|
||||
enforce_new_defaults => $enforce_new_defaults,
|
||||
policy_file => $policy_path
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -0,0 +1,5 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
The new ``aodh::policy::enforce_new_defaults`` parameter has been
|
||||
added.
|
@ -4,9 +4,10 @@ describe 'aodh::policy' do
|
||||
shared_examples 'aodh::policy' do
|
||||
let :params do
|
||||
{
|
||||
:enforce_scope => false,
|
||||
:policy_path => '/etc/aodh/policy.yaml',
|
||||
:policies => {
|
||||
:enforce_scope => false,
|
||||
:enforce_new_defaults => false,
|
||||
:policy_path => '/etc/aodh/policy.yaml',
|
||||
:policies => {
|
||||
'context_is_admin' => {
|
||||
'key' => 'context_is_admin',
|
||||
'value' => 'foo:bar'
|
||||
@ -24,8 +25,9 @@ describe 'aodh::policy' do
|
||||
:file_format => 'yaml',
|
||||
})
|
||||
is_expected.to contain_oslo__policy('aodh_config').with(
|
||||
:enforce_scope => false,
|
||||
:policy_file => '/etc/aodh/policy.yaml',
|
||||
:enforce_scope => false,
|
||||
:enforce_new_defaults => false,
|
||||
:policy_file => '/etc/aodh/policy.yaml',
|
||||
)
|
||||
end
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user