Add missing AMQP options to ceilometer.conf

Add more AMQP and QPID configuration options
to the ceilometer configuration file. This enables
users to use QPID federation support and also
use durable queues for rabbitmq or QPID.

Change-Id: I7cf1230cadf41313cd505bf8d89509c9f064e0e3
This commit is contained in:
Matt Odden 2014-06-18 19:47:39 +00:00
parent 051daaadce
commit d3d61e474f
3 changed files with 15 additions and 5 deletions

View File

@ -21,6 +21,6 @@ recipe 'openstack-telemetry::identity_registration', 'Registers the endpoints, t
supports os
end
depends 'openstack-common', '~> 9.0'
depends 'openstack-common', '~> 9.4'
depends 'openstack-identity', '~> 9.0'
depends 'openstack-compute', '~> 9.0'

View File

@ -56,6 +56,13 @@ describe 'openstack-telemetry::common' do
)
end
it 'has default RPC/AMQP options set' do
[/^amqp_durable_queues=false$/,
/^amqp_auto_delete=false$/].each do |line|
expect(chef_run).to render_file(file.name).with_content(line)
end
end
context 'rabbit mq backend' do
before do
node.set['openstack']['mq']['telemetry']['service_type'] = 'rabbitmq'
@ -101,7 +108,8 @@ describe 'openstack-telemetry::common' do
/^qpid_reconnect_interval=0$/,
/^qpid_heartbeat=60$/,
/^qpid_protocol=tcp$/,
/^qpid_tcp_nodelay=true$/
/^qpid_tcp_nodelay=true$/,
/^qpid_topology_version=1$/
].each do |line|
expect(chef_run).to render_file(file.name).with_content(line)
end

View File

@ -13,7 +13,11 @@ hypervisor_inspector = <%= node["openstack"]["telemetry"]["hypervisor_inspector"
log_config = /etc/openstack/logging.conf
<% end %>
##### AMQP #####
notification_topics = notifications,glance_notifications
amqp_durable_queues=<%= node["openstack"]["mq"]["telemetry"]["durable_queues"] %>
amqp_auto_delete=<%= node["openstack"]["mq"]["telemetry"]["auto_delete"] %>
<% if @mq_service_type == "rabbitmq" %>
##### RABBITMQ #####
rabbit_userid = <%= node["openstack"]["mq"]["telemetry"]["rabbit"]["userid"] %>
@ -25,13 +29,11 @@ rabbit_use_ssl = <%= node["openstack"]["mq"]["telemetry"]["rabbit"]["use_ssl"] %
rpc_backend = ceilometer.openstack.common.rpc.impl_kombu
<% end %>
<% if @mq_service_type == "qpid" %>
##### QPID #####
rpc_backend=ceilometer.openstack.common.rpc.impl_qpid
qpid_hostname=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["host"] %>
qpid_port=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["port"] %>
qpid_password=<%= @mq_password %>
qpid_username=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["username"] %>
qpid_sasl_mechanisms=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["sasl_mechanisms"] %>
@ -45,7 +47,7 @@ qpid_heartbeat=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["heartbeat"] %>
# qpid protocol. default 'tcp'. set to 'ssl' to enable SSL
qpid_protocol=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["protocol"] %>
qpid_tcp_nodelay=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["tcp_nodelay"] %>
qpid_topology_version=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["topology_version"] %>
<% end %>
glance_registry_host = <%= @image_endpoint.host %>