diff --git a/manifests/init.pp b/manifests/init.pp index 04fbc7e1..ebf09b31 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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': diff --git a/releasenotes/notes/add_rabbit_kombu_options-a3b52f3aec9b3a48.yaml b/releasenotes/notes/add_rabbit_kombu_options-a3b52f3aec9b3a48.yaml new file mode 100644 index 00000000..8ade1157 --- /dev/null +++ b/releasenotes/notes/add_rabbit_kombu_options-a3b52f3aec9b3a48.yaml @@ -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. diff --git a/spec/classes/manila_init_spec.rb b/spec/classes/manila_init_spec.rb index d5a67460..779fc323 100644 --- a/spec/classes/manila_init_spec.rb +++ b/spec/classes/manila_init_spec.rb @@ -70,6 +70,9 @@ describe 'manila' do is_expected.to contain_manila_config('oslo_messaging_rabbit/rabbit_userid').with( :value => '' ) + is_expected.to contain_manila_config('oslo_messaging_rabbit/kombu_failover_strategy').with( + :value => '' + ) is_expected.to contain_manila_config('DEFAULT/debug').with( :value => '' )