Expose parameter to customize [oslo_messaging_notifications] retry
The parameter has been managed by puppet-oslo, but its value could not be set via this module. Change-Id: If3e116d293d2ed1ed81e53a07bbff6415b9c1465
This commit is contained in:
parent
32e7d18998
commit
a5f46b8752
@ -165,7 +165,8 @@ class trove::guestagent(
|
||||
oslo::messaging::notifications { 'trove_guestagent_config':
|
||||
transport_url => $::trove::notification_transport_url,
|
||||
driver => $::trove::notification_driver,
|
||||
topics => $::trove::notification_topics
|
||||
topics => $::trove::notification_topics,
|
||||
retry => $::trove::notification_retry,
|
||||
}
|
||||
|
||||
oslo::messaging::rabbit {'trove_guestagent_config':
|
||||
|
@ -43,6 +43,11 @@
|
||||
# (optional) AMQP topic used for OpenStack notifications
|
||||
# Defaults to $facts['os_service_default']
|
||||
#
|
||||
# [*notification_retry*]
|
||||
# (optional) The maximum number of attempts to re-sent a notification
|
||||
# message, which failed to be delivered due to a recoverable error.
|
||||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
# [*rabbit_use_ssl*]
|
||||
# (optional) Connect over SSL for RabbitMQ
|
||||
# Defaults to $facts['os_service_default']
|
||||
@ -245,6 +250,7 @@ class trove(
|
||||
$notification_transport_url = $facts['os_service_default'],
|
||||
$notification_driver = $facts['os_service_default'],
|
||||
$notification_topics = $facts['os_service_default'],
|
||||
$notification_retry = $facts['os_service_default'],
|
||||
$rabbit_use_ssl = $facts['os_service_default'],
|
||||
$rabbit_ha_queues = $facts['os_service_default'],
|
||||
$rabbit_notification_topic = $facts['os_service_default'],
|
||||
@ -353,7 +359,8 @@ class trove(
|
||||
oslo::messaging::notifications { 'trove_config':
|
||||
transport_url => $notification_transport_url,
|
||||
driver => $notification_driver,
|
||||
topics => $notification_topics
|
||||
topics => $notification_topics,
|
||||
retry => $notification_retry,
|
||||
}
|
||||
|
||||
oslo::messaging::rabbit { 'trove_config':
|
||||
|
@ -0,0 +1,4 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
The new ``trove::notification_retry`` parameter has been added.
|
@ -42,7 +42,8 @@ describe 'trove::guestagent' do
|
||||
is_expected.to contain_oslo__messaging__notifications('trove_guestagent_config').with(
|
||||
:transport_url => '<SERVICE DEFAULT>',
|
||||
:driver => '<SERVICE DEFAULT>',
|
||||
:topics => '<SERVICE DEFAULT>'
|
||||
:topics => '<SERVICE DEFAULT>',
|
||||
:retry => '<SERVICE DEFAULT>',
|
||||
)
|
||||
|
||||
is_expected.to contain_oslo__messaging__rabbit('trove_guestagent_config').with(
|
||||
|
@ -77,7 +77,8 @@ describe 'trove' do
|
||||
is_expected.to contain_oslo__messaging__notifications('trove_config').with(
|
||||
:transport_url => '<SERVICE DEFAULT>',
|
||||
:driver => '<SERVICE DEFAULT>',
|
||||
:topics => '<SERVICE DEFAULT>'
|
||||
:topics => '<SERVICE DEFAULT>',
|
||||
:retry => '<SERVICE DEFAULT>',
|
||||
)
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user