diff --git a/manifests/init.pp b/manifests/init.pp index 509bbb5..96bf854 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -37,6 +37,24 @@ # will be run through a green thread. # Defaults to $facts['os_service_default'] # +# [*rabbit_quorum_queue*] +# (Optional) Use quorum queues in RabbitMQ. +# Defaults to $facts['os_service_default'] +# +# [*rabbit_quorum_delivery_limit*] +# (Optional) Each time a message is rdelivered to a consumer, a counter is +# incremented. Once the redelivery count exceeds the delivery limit +# the message gets dropped or dead-lettered. +# Defaults to $facts['os_service_default'] +# +# [*rabbit_quorum_max_memory_length*] +# (Optional) Limit the number of messages in the quorum queue. +# Defaults to $facts['os_service_default'] +# +# [*rabbit_quorum_max_memory_bytes*] +# (Optional) Limit the number of memory bytes used by the quorum queue. +# Defaults to $facts['os_service_default'] +# # [*rabbit_use_ssl*] # (Optional) Connect over SSL for RabbitMQ. # Defaults to $facts['os_service_default']. @@ -231,6 +249,10 @@ class cloudkitty( $rabbit_heartbeat_rate = $facts['os_service_default'], $rabbit_heartbeat_in_pthread = $facts['os_service_default'], $rabbit_ha_queues = $facts['os_service_default'], + $rabbit_quorum_queue = $facts['os_service_default'], + $rabbit_quorum_delivery_limit = $facts['os_service_default'], + $rabbit_quorum_max_memory_length = $facts['os_service_default'], + $rabbit_quorum_max_memory_bytes = $facts['os_service_default'], $kombu_ssl_ca_certs = $facts['os_service_default'], $kombu_ssl_certfile = $facts['os_service_default'], $kombu_ssl_keyfile = $facts['os_service_default'], @@ -291,19 +313,23 @@ class cloudkitty( } oslo::messaging::rabbit { 'cloudkitty_config': - rabbit_ha_queues => $rabbit_ha_queues, - rabbit_use_ssl => $rabbit_use_ssl, - amqp_durable_queues => $amqp_durable_queues, - heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold, - heartbeat_rate => $rabbit_heartbeat_rate, - heartbeat_in_pthread => $rabbit_heartbeat_in_pthread, - kombu_ssl_version => $kombu_ssl_version, - kombu_ssl_keyfile => $kombu_ssl_keyfile, - kombu_ssl_certfile => $kombu_ssl_certfile, - kombu_ssl_ca_certs => $kombu_ssl_ca_certs, - kombu_reconnect_delay => $kombu_reconnect_delay, - kombu_failover_strategy => $kombu_failover_strategy, - kombu_compression => $kombu_compression, + rabbit_ha_queues => $rabbit_ha_queues, + rabbit_use_ssl => $rabbit_use_ssl, + amqp_durable_queues => $amqp_durable_queues, + heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold, + heartbeat_rate => $rabbit_heartbeat_rate, + heartbeat_in_pthread => $rabbit_heartbeat_in_pthread, + kombu_ssl_version => $kombu_ssl_version, + kombu_ssl_keyfile => $kombu_ssl_keyfile, + kombu_ssl_certfile => $kombu_ssl_certfile, + kombu_ssl_ca_certs => $kombu_ssl_ca_certs, + kombu_reconnect_delay => $kombu_reconnect_delay, + kombu_failover_strategy => $kombu_failover_strategy, + kombu_compression => $kombu_compression, + rabbit_quorum_queue => $rabbit_quorum_queue, + rabbit_quorum_delivery_limit => $rabbit_quorum_delivery_limit, + rabbit_quorum_max_memory_length => $rabbit_quorum_max_memory_length, + rabbit_quorum_max_memory_bytes => $rabbit_quorum_max_memory_bytes, } oslo::messaging::amqp { 'cloudkitty_config': diff --git a/releasenotes/notes/rabbit-quorum-queue-09b6b75672eff2b9.yaml b/releasenotes/notes/rabbit-quorum-queue-09b6b75672eff2b9.yaml new file mode 100644 index 0000000..2f3d9d4 --- /dev/null +++ b/releasenotes/notes/rabbit-quorum-queue-09b6b75672eff2b9.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The ``cloudkitty`` class now supports options for quorum queues in + RabbitMQ. diff --git a/spec/classes/cloudkitty_init_spec.rb b/spec/classes/cloudkitty_init_spec.rb index 50fd21c..623bba2 100644 --- a/spec/classes/cloudkitty_init_spec.rb +++ b/spec/classes/cloudkitty_init_spec.rb @@ -28,20 +28,24 @@ describe 'cloudkitty' do :control_exchange => '' ) is_expected.to contain_oslo__messaging__rabbit('cloudkitty_config').with( - :rabbit_use_ssl => '', - :heartbeat_timeout_threshold => '', - :heartbeat_rate => '', - :heartbeat_in_pthread => '', - :kombu_reconnect_delay => '', - :kombu_failover_strategy => '', - :amqp_durable_queues => '', - :kombu_compression => '', - :kombu_ssl_ca_certs => '', - :kombu_ssl_certfile => '', - :kombu_ssl_keyfile => '', - :kombu_ssl_version => '', - :rabbit_ha_queues => '', - :rabbit_retry_interval => '', + :rabbit_use_ssl => '', + :heartbeat_timeout_threshold => '', + :heartbeat_rate => '', + :heartbeat_in_pthread => '', + :kombu_reconnect_delay => '', + :kombu_failover_strategy => '', + :amqp_durable_queues => '', + :kombu_compression => '', + :kombu_ssl_ca_certs => '', + :kombu_ssl_certfile => '', + :kombu_ssl_keyfile => '', + :kombu_ssl_version => '', + :rabbit_ha_queues => '', + :rabbit_retry_interval => '', + :rabbit_quorum_queue => '', + :rabbit_quorum_delivery_limit => '', + :rabbit_quorum_max_memory_length => '', + :rabbit_quorum_max_memory_bytes => '', ) is_expected.to contain_oslo__messaging__notifications('cloudkitty_config').with( :transport_url => '', @@ -86,10 +90,14 @@ describe 'cloudkitty' do let :params do { :rabbit_ha_queues => true, - :rabbit_heartbeat_timeout_threshold => '60', - :rabbit_heartbeat_rate => '10', + :rabbit_heartbeat_timeout_threshold => 60, + :rabbit_heartbeat_rate => 10, :rabbit_heartbeat_in_pthread => true, - :kombu_reconnect_delay => '5.0', + :rabbit_quorum_queue => true, + :rabbit_quorum_delivery_limit => 3, + :rabbit_quorum_max_memory_length => 5, + :rabbit_quorum_max_memory_bytes => 1073741824, + :kombu_reconnect_delay => 5.0, :amqp_durable_queues => true, :kombu_compression => 'gzip', :package_ensure => '2012.1.1-15.el6', @@ -110,13 +118,17 @@ describe 'cloudkitty' do :control_exchange => 'cloudkitty' ) is_expected.to contain_oslo__messaging__rabbit('cloudkitty_config').with( - :heartbeat_timeout_threshold => '60', - :heartbeat_rate => '10', - :heartbeat_in_pthread => true, - :kombu_reconnect_delay => '5.0', - :amqp_durable_queues => true, - :kombu_compression => 'gzip', - :rabbit_ha_queues => true, + :heartbeat_timeout_threshold => 60, + :heartbeat_rate => 10, + :heartbeat_in_pthread => true, + :kombu_reconnect_delay => 5.0, + :amqp_durable_queues => true, + :kombu_compression => 'gzip', + :rabbit_ha_queues => true, + :rabbit_quorum_queue => true, + :rabbit_quorum_delivery_limit => 3, + :rabbit_quorum_max_memory_length => 5, + :rabbit_quorum_max_memory_bytes => 1073741824, ) is_expected.to contain_oslo__messaging__notifications('cloudkitty_config').with( :transport_url => '',