openstack/puppet-keystone
Code Issues Proposed changes

Add support for [DEFAULT] notification_opt_out

Browse Source 
Change-Id: I0866f2d546b9f23acef5a7e15bdf334ff781655d
This commit is contained in:
Takashi Kajinami
2022-05-09 08:35:38 +09:00
parent afc28df75d
commit 6d90c87e01
3 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/init.pp
View File

@@ -148,8 +148,14 @@
# Default to $::os_service_default
#
# [*notification_format*]
# Format for the notifications. Valid values are 'basic' and 'cadf'.
# Default to undef
# (Optional) Define the notification format for identity service events.
# Valid values are 'basic' and 'cadf'.
# Default to $::os_service_default
#
# [*notification_opt_out*]
# (Optional) Opt out notifications that match the patterns expressed in this
# list.
# Defaults to $::os_service_default
#
# [*control_exchange*]
# (Optional) AMQP exchange to connect to if using RabbitMQ
@@ -413,6 +419,7 @@ class keystone(
$notification_driver = $::os_service_default,
$notification_topics = $::os_service_default,
$notification_format = $::os_service_default,
$notification_opt_out = $::os_service_default,
$control_exchange = $::os_service_default,
$rpc_response_timeout = $::os_service_default,
$service_name = $::keystone::params::service_name,
@@ -590,7 +597,11 @@ class keystone(
keystone_config {
'token/provider': value => $token_provider;
'DEFAULT/max_token_size': value => $max_token_size;
'DEFAULT/notification_format': value => $notification_format;
}
keystone_config {
'DEFAULT/notification_format': value => $notification_format;
'DEFAULT/notification_opt_out': value => $notification_opt_out;
}
oslo::messaging::default { 'keystone_config':

4
releasenotes/notes/notification_opt_out-5c87151211fe8840.yaml Normal file
View File

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

11
spec/classes/keystone_init_spec.rb
View File

@@ -56,6 +56,7 @@ describe 'keystone' do
is_expected.to contain_keystone_config('token/provider').with_value('fernet')
is_expected.to contain_keystone_config('DEFAULT/max_token_size').with_value('<SERVICE DEFAULT>')
is_expected.to contain_keystone_config('DEFAULT/notification_format').with_value('<SERVICE DEFAULT>')
is_expected.to contain_keystone_config('DEFAULT/notification_opt_out').with_value('<SERVICE DEFAULT>')
is_expected.to contain_oslo__messaging__default('keystone_config').with(
:transport_url => '<SERVICE DEFAULT>',
@@ -134,6 +135,11 @@ describe 'keystone' do
:token_provider => 'uuid',
:max_token_size => 255,
:notification_format => 'basic',
:notification_opt_out => [
'identity.authenticate.success',
'identity.authenticate.pending',
'identity.authenticate.failed'
],
}
end
@@ -157,6 +163,11 @@ describe 'keystone' do
is_expected.to contain_keystone_config('token/provider').with_value('uuid')
is_expected.to contain_keystone_config('DEFAULT/max_token_size').with_value(255)
is_expected.to contain_keystone_config('DEFAULT/notification_format').with_value('basic')
is_expected.to contain_keystone_config('DEFAULT/notification_opt_out').with_value([
'identity.authenticate.success',
'identity.authenticate.pending',
'identity.authenticate.failed'
])
end
end