openstack/puppet-neutron
Code Issues Proposed changes

Merge "Expose parameter to customize [oslo_messaging_notifications] retry"

Browse Source
This commit is contained in:
Zuul 2024-09-30 14:01:03 +00:00 committed by Gerrit Code Review
commit 686621ffee
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
manifests/init.pp
View File

@ -252,6 +252,13 @@
# in the neutron config. # in the neutron config.
# Defaults to false. # Defaults to false.
# #
# [*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'].
#
# [*notification_driver*] # [*notification_driver*]
# (optional) Driver or drivers to handle sending notifications. # (optional) Driver or drivers to handle sending notifications.
# Value can be a string or a list. # Value can be a string or a list.
@ -261,11 +268,9 @@
# (optional) AMQP topic used for OpenStack notifications # (optional) AMQP topic used for OpenStack notifications
# Defaults to facts['os_service_default'] # Defaults to facts['os_service_default']
# #
# [*notification_transport_url*] # [*notification_retry*]
# (optional) A URL representing the messaging driver to use for # (optional) The maximum number of attempts to re-sent a notification
# notifications and its full configuration. Transport URLs # message, which failed to be delivered due to a recoverable error.
# take the form:
# transport://user:pass@host1:port[,hostN:portN]/virtual_host
# Defaults to $facts['os_service_default']. # Defaults to $facts['os_service_default'].
# #
# [*max_allowed_address_pair*] # [*max_allowed_address_pair*]
@ -328,9 +333,10 @@ class neutron (
$state_path = $facts['os_service_default'], $state_path = $facts['os_service_default'],
$lock_path = '$state_path/lock', $lock_path = '$state_path/lock',
Boolean $purge_config = false, Boolean $purge_config = false,
$notification_transport_url = $facts['os_service_default'],
$notification_driver = $facts['os_service_default'], $notification_driver = $facts['os_service_default'],
$notification_topics = $facts['os_service_default'], $notification_topics = $facts['os_service_default'],
$notification_transport_url = $facts['os_service_default'], $notification_retry = $facts['os_service_default'],
$max_allowed_address_pair = $facts['os_service_default'], $max_allowed_address_pair = $facts['os_service_default'],
$vlan_transparent = $facts['os_service_default'], $vlan_transparent = $facts['os_service_default'],
) { ) {
@ -395,9 +401,10 @@ class neutron (
oslo::concurrency { 'neutron_config': lock_path => $lock_path } oslo::concurrency { 'neutron_config': lock_path => $lock_path }
oslo::messaging::notifications { 'neutron_config': oslo::messaging::notifications { 'neutron_config':
transport_url => $notification_transport_url,
driver => $notification_driver, driver => $notification_driver,
topics => $notification_topics, topics => $notification_topics,
transport_url => $notification_transport_url, retry => $notification_retry,
} }
neutron_config { neutron_config {

3
spec/classes/neutron_init_spec.rb
View File

@ -56,6 +56,7 @@ describe 'neutron' do
:transport_url => '<SERVICE DEFAULT>', :transport_url => '<SERVICE DEFAULT>',
:driver => '<SERVICE DEFAULT>', :driver => '<SERVICE DEFAULT>',
:topics => '<SERVICE DEFAULT>', :topics => '<SERVICE DEFAULT>',
:retry => '<SERVICE DEFAULT>',
) )
end end
@ -145,6 +146,7 @@ describe 'neutron' do
:notification_transport_url => 'rabbit://rabbit_user:password@localhost:5673', :notification_transport_url => 'rabbit://rabbit_user:password@localhost:5673',
:notification_driver => 'mesagingv2', :notification_driver => 'mesagingv2',
:notification_topics => 'notifications', :notification_topics => 'notifications',
:notification_retry => 10,
) )
end end
@ -153,6 +155,7 @@ describe 'neutron' do
:transport_url => params[:notification_transport_url], :transport_url => params[:notification_transport_url],
:driver => params[:notification_driver], :driver => params[:notification_driver],
:topics => params[:notification_topics], :topics => params[:notification_topics],
:retry => params[:notification_retry],
) )
end end
end end