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: I16c316300cfda5fd14513837e325176507fd4ba3
This commit is contained in:
Takashi Kajinami 2024-09-30 21:58:28 +09:00
parent 94e356223c
commit dccda34953
3 changed files with 37 additions and 21 deletions

View File

@ -9,35 +9,40 @@
# Defaults to 'present'
#
# [*notification_transport_url*]
# (Optional) A URL representing the messaging driver to use for notifications
# and its full configuration. Transport URLs take the form:
# transport://user:pass@host1:port[,hostN:portN]/virtual_host
# Defaults to $facts['os_service_default']
# (Optional) A URL representing the messaging driver to use for notifications
# and its full configuration. Transport URLs take the form:
# transport://user:pass@host1:port[,hostN:portN]/virtual_host
# Defaults to $facts['os_service_default']
#
# [*notification_topics*]
# (Optional) AMQP topics to publish to when using the RPC notification driver.
# (list value)
# Default to $facts['os_service_default']
# (Optional) AMQP topics to publish to when using the RPC notification driver.
# (list value)
# Default to $facts['os_service_default']
#
# [*notification_driver*]
# (Optional) Notification driver to use
# Defaults to $facts['os_service_default']
# (Optional) Notification driver to use
# 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'].
#
# [*default_transport_url*]
# (Optional) A URL representing the messaging driver to use and its full
# configuration. Transport URLs take the form:
# transport://user:pass@host1:port[,hostN:portN]/virtual_host
# Defaults to $facts['os_service_default']
# (Optional) A URL representing the messaging driver to use and its full
# configuration. Transport URLs take the form:
# transport://user:pass@host1:port[,hostN:portN]/virtual_host
# Defaults to $facts['os_service_default']
#
# [*rpc_response_timeout*]
# (Optional) Seconds to wait for a response from a call.
# Defaults to $facts['os_service_default']
# (Optional) Seconds to wait for a response from a call.
# Defaults to $facts['os_service_default']
#
# [*control_exchange*]
# (Optional) The default exchange under which topics are scoped. May be
# overridden by an exchange name specified in the transport_url
# option.
# Defaults to $facts['os_service_default']
# (Optional) The default exchange under which topics are scoped. May be
# overridden by an exchange name specified in the transport_url
# option.
# Defaults to $facts['os_service_default']
#
# [*rabbit_ha_queues*]
# (Optional) Use HA queues in RabbitMQ.
@ -152,6 +157,7 @@ class magnum(
$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'],
$default_transport_url = $facts['os_service_default'],
$rpc_response_timeout = $facts['os_service_default'],
$control_exchange = $facts['os_service_default'],
@ -226,6 +232,7 @@ class magnum(
transport_url => $notification_transport_url,
driver => $notification_driver,
topics => $notification_topics,
retry => $notification_retry,
}
}

View File

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

View File

@ -59,7 +59,9 @@ describe 'magnum' do
is_expected.to contain_oslo__messaging__notifications('magnum_config').with(
:transport_url => '<SERVICE DEFAULT>',
:driver => '<SERVICE DEFAULT>',
:topics => '<SERVICE DEFAULT>')
:topics => '<SERVICE DEFAULT>',
:retry => '<SERVICE DEFAULT>',
)
end
end
@ -70,6 +72,7 @@ describe 'magnum' do
:notification_transport_url => 'rabbit://user:pass@host:1234/virt',
:notification_topics => 'openstack',
:notification_driver => 'messagingv1',
:notification_retry => 10,
:default_transport_url => 'rabbit://user:pass@host:1234/virt',
:rpc_response_timeout => '120',
:control_exchange => 'magnum',
@ -131,7 +134,9 @@ describe 'magnum' do
is_expected.to contain_oslo__messaging__notifications('magnum_config').with(
:transport_url => 'rabbit://user:pass@host:1234/virt',
:driver => 'messagingv1',
:topics => 'openstack')
:topics => 'openstack',
:retry => 10,
)
end
end