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: Iee6a97e665d4a830bad6a572142ed7bb3ec3afd2
This commit is contained in:
@@ -146,6 +146,11 @@
|
|||||||
# (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_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'].
|
||||||
|
#
|
||||||
# [*topic*]
|
# [*topic*]
|
||||||
# Messaging topic for controller-worker RPC communication.
|
# Messaging topic for controller-worker RPC communication.
|
||||||
# Defaults to 'octavia-rpc'
|
# Defaults to 'octavia-rpc'
|
||||||
@@ -184,6 +189,7 @@ class octavia (
|
|||||||
$notification_transport_url = $facts['os_service_default'],
|
$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_retry = $facts['os_service_default'],
|
||||||
$topic = 'octavia-rpc',
|
$topic = 'octavia-rpc',
|
||||||
Boolean $purge_config = false,
|
Boolean $purge_config = false,
|
||||||
) inherits octavia::params {
|
) inherits octavia::params {
|
||||||
@@ -235,6 +241,7 @@ class octavia (
|
|||||||
transport_url => $notification_transport_url,
|
transport_url => $notification_transport_url,
|
||||||
driver => $notification_driver,
|
driver => $notification_driver,
|
||||||
topics => $notification_topics,
|
topics => $notification_topics,
|
||||||
|
retry => $notification_retry,
|
||||||
}
|
}
|
||||||
|
|
||||||
# This isn't really an oslo_messaging configuration, but an octavia specific configuration item
|
# This isn't really an oslo_messaging configuration, but an octavia specific configuration item
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The new ``octavia::notification_retry`` parameter has been added.
|
||||||
@@ -60,6 +60,7 @@ describe 'octavia' 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
|
||||||
end
|
end
|
||||||
@@ -94,6 +95,7 @@ describe 'octavia' do
|
|||||||
:notification_transport_url => 'rabbit://rabbit_user:password@localhost:5673',
|
:notification_transport_url => 'rabbit://rabbit_user:password@localhost:5673',
|
||||||
:notification_driver => 'ceilometer.compute.octavia_notifier',
|
:notification_driver => 'ceilometer.compute.octavia_notifier',
|
||||||
:notification_topics => 'openstack',
|
:notification_topics => 'openstack',
|
||||||
|
:notification_retry => 10,
|
||||||
:topic => 'oct-rpc',
|
:topic => 'oct-rpc',
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
@@ -131,6 +133,7 @@ describe 'octavia' do
|
|||||||
:transport_url => 'rabbit://rabbit_user:password@localhost:5673',
|
:transport_url => 'rabbit://rabbit_user:password@localhost:5673',
|
||||||
:driver => 'ceilometer.compute.octavia_notifier',
|
:driver => 'ceilometer.compute.octavia_notifier',
|
||||||
:topics => 'openstack',
|
:topics => 'openstack',
|
||||||
|
:retry => 10,
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user