openstack
/
puppet-manila
Code Issues Proposed changes

Add kombu_failover_strategy option 

Adds the kombu_failover_strategy option for configuring
oslo.messaging.rabbit. This will determines how the next RabbitMQ node
is chosen in case the one we are currently connected to becomes
unavailable.

Change-Id: I2ec87a9649143548847c46110ef1ad9353a71feb
Closes-Bug: #1748353
This commit is contained in:
ZhongShengping 2018-02-09 14:46:35 +08:00
parent 07e6456c87
commit dd721c2e25
3 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
manifests/init.pp
View File

@ -95,6 +95,12 @@
# available on some distributions.
# Defaults to $::os_service_default
#
# [*kombu_failover_strategy*]
# (Optional) Determines how the next RabbitMQ node is chosen in case the one
# we are currently connected to becomes unavailable. Takes effect only if
# more than one RabbitMQ node is provided in config. (string value)
# Defaults to $::os_service_default
#
# [*amqp_durable_queues*]
# (optional) Use durable queues in amqp.
# Defaults to $::os_service_default.
@ -276,6 +282,7 @@ class manila (
$kombu_ssl_certfile = $::os_service_default,
$kombu_ssl_keyfile = $::os_service_default,
$kombu_ssl_version = $::os_service_default,
$kombu_failover_strategy = $::os_service_default,
$amqp_durable_queues = $::os_service_default,
$package_ensure = 'present',
$use_ssl = false,
@ -357,19 +364,20 @@ manila::rpc_backend are deprecated. Please use manila::default_transport_url ins
}
oslo::messaging::rabbit { 'manila_config':
rabbit_password => $rabbit_password,
rabbit_userid => $rabbit_userid,
rabbit_virtual_host => $rabbit_virtual_host,
rabbit_use_ssl => $rabbit_use_ssl,
amqp_durable_queues => $amqp_durable_queues,
rabbit_hosts => $rabbit_hosts,
rabbit_host => $rabbit_host,
rabbit_port => $rabbit_port,
rabbit_ha_queues => $rabbit_ha_queues,
kombu_ssl_ca_certs => $kombu_ssl_ca_certs,
kombu_ssl_certfile => $kombu_ssl_certfile,
kombu_ssl_keyfile => $kombu_ssl_keyfile,
kombu_ssl_version => $kombu_ssl_version,
rabbit_password => $rabbit_password,
rabbit_userid => $rabbit_userid,
rabbit_virtual_host => $rabbit_virtual_host,
rabbit_use_ssl => $rabbit_use_ssl,
amqp_durable_queues => $amqp_durable_queues,
rabbit_hosts => $rabbit_hosts,
rabbit_host => $rabbit_host,
rabbit_port => $rabbit_port,
rabbit_ha_queues => $rabbit_ha_queues,
kombu_ssl_ca_certs => $kombu_ssl_ca_certs,
kombu_ssl_certfile => $kombu_ssl_certfile,
kombu_ssl_keyfile => $kombu_ssl_keyfile,
kombu_ssl_version => $kombu_ssl_version,
kombu_failover_strategy => $kombu_failover_strategy,
}
oslo::messaging::amqp { 'manila_config':

6
releasenotes/notes/add_rabbit_kombu_options-a3b52f3aec9b3a48.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
Adds the kombu_failover_strategy option for configuring oslo.messaging.rabbit.
This will determines how the next RabbitMQ node is chosen in case the one we
are currently connected to becomes unavailable.

3
spec/classes/manila_init_spec.rb
View File

@ -70,6 +70,9 @@ describe 'manila' do
is_expected.to contain_manila_config('oslo_messaging_rabbit/rabbit_userid').with(
:value => '<SERVICE DEFAULT>'
)
is_expected.to contain_manila_config('oslo_messaging_rabbit/kombu_failover_strategy').with(
:value => '<SERVICE DEFAULT>'
)
is_expected.to contain_manila_config('DEFAULT/debug').with(
:value => '<SERVICE DEFAULT>'
)