openstack
/
cookbook-openstack-compute
Code Issues Proposed changes

Merge "make rabbit _virtual_host _port params optional"

This commit is contained in:
Jenkins 2013-05-17 20:39:42 +00:00 committed by Gerrit Code Review
parent b9638dd036 870dd66d1e
commit 071c7ea7cd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/default/ceilometer.conf.erb
View File

@ -8,9 +8,9 @@ sql_connection = <%= @sql_connection %>
<%= @database_connection ? "database_connection = #{@database_connection}" : nil %>
rabbit_userid = <%= @rabbit_user %>
rabbit_password = <%= @rabbit_pass %>
rabbit_port = <%= @rabbit_port %>
<%= "rabbit_port = #{@rabbit_port}" if @rabbit_port %>
rabbit_host = <%= @rabbit_ipaddress %>
rabbit_virtual_host = <%= @rabbit_virtual_host %>
<%= "rabbit_virtual_host = #{@rabbit_virtual_host}" if @rabbit_virtual_host %>
verbose = True
notification_topics = notifications,glance_notifications
rpc_backend = ceilometer.openstack.common.rpc.impl_kombu