From 7da50571cf98d215c8551b52cacb4f891d5f4207 Mon Sep 17 00:00:00 2001 From: Jake Yip Date: Mon, 22 May 2017 13:19:25 +1000 Subject: [PATCH] Add rabbit_qos_prefetch_count to oslo_messaging_rabbit options Depends-On: Ib301df384d271da27094376389e981fe51e39e5f Change-Id: I7dabc2379cbbdfd1fb2fb5d05a6f1f7c6df400e4 --- manifests/init.pp | 7 ++++++- spec/classes/ceilometer_init_spec.rb | 12 ++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index a73a6b01..b4843196 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -83,7 +83,6 @@ # amqp and zmq. (string value) # Default to $::os_service_default # -# # [*rabbit_ha_queues*] # (Optional) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this # option, you must wipe the RabbitMQ database. (boolean value) @@ -100,6 +99,10 @@ # we check the heartbeat. (integer value) # Defaults to $::os_service_default # +# [*rabbit_qos_prefetch_count*] +# (Optional) Specifies the number of messages to prefetch. +# Defaults to $::os_service_default +# # [*rabbit_use_ssl*] # (Optional) Connect over SSL for RabbitMQ. (boolean value) # Defaults to $::os_service_default @@ -278,6 +281,7 @@ class ceilometer( $rabbit_ha_queues = $::os_service_default, $rabbit_heartbeat_timeout_threshold = $::os_service_default, $rabbit_heartbeat_rate = $::os_service_default, + $rabbit_qos_prefetch_count = $::os_service_default, $amqp_durable_queues = $::os_service_default, $rabbit_use_ssl = $::os_service_default, $kombu_ssl_ca_certs = $::os_service_default, @@ -396,6 +400,7 @@ please use memcache_servers instead.") rabbit_ha_queues => $rabbit_ha_queues, heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold, heartbeat_rate => $rabbit_heartbeat_rate, + rabbit_qos_prefetch_count => $rabbit_qos_prefetch_count, amqp_durable_queues => $amqp_durable_queues, rabbit_use_ssl => $rabbit_use_ssl, kombu_ssl_ca_certs => $kombu_ssl_ca_certs, diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb index 02e8650c..41e07a31 100644 --- a/spec/classes/ceilometer_init_spec.rb +++ b/spec/classes/ceilometer_init_spec.rb @@ -18,10 +18,11 @@ describe 'ceilometer' do let :rabbit_params do { - :rabbit_host => '127.0.0.1', - :rabbit_port => 5672, - :rabbit_userid => 'guest', - :rabbit_password => '', + :rabbit_host => '127.0.0.1', + :rabbit_port => 5672, + :rabbit_userid => 'guest', + :rabbit_password => '', + :rabbit_qos_prefetch_count => 10, } end @@ -208,6 +209,7 @@ describe 'ceilometer' do it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/rabbit_host').with_value( params[:rabbit_host] ) } it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/rabbit_port').with_value( params[:rabbit_port] ) } + it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/rabbit_qos_prefetch_count').with_value( params[:rabbit_qos_prefetch_count] ) } it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/rabbit_hosts').with_value('') } it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('') } @@ -226,6 +228,7 @@ describe 'ceilometer' do it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/rabbit_host').with_value('') } it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/rabbit_port').with_value('') } + it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/rabbit_qos_prefetch_count').with_value( params[:rabbit_qos_prefetch_count] ) } it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/rabbit_hosts').with_value( params[:rabbit_hosts].join(',') ) } it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('') } @@ -251,6 +254,7 @@ describe 'ceilometer' do it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/rabbit_host').with_value('') } it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/rabbit_port').with_value('') } + it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/rabbit_qos_prefetch_count').with_value( params[:rabbit_qos_prefetch_count] ) } it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/rabbit_hosts').with_value( params[:rabbit_hosts].join(',') ) } it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value(true) }