Merge pull request #46 from cloudnull/issue799-again

Merged automatically by jenkins after successful build test
rcbops-cookbooks · Mar 27, 2014 · 595c67b · 595c67b
2 parents 2629d0f + 95dee57
commit 595c67b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/files/default/ceilometer-dist.conf b/files/default/ceilometer-dist.conf
@@ -0,0 +1 @@
+# Your doing it wrong REDHAT!
diff --git a/recipes/ceilometer-common.rb b/recipes/ceilometer-common.rb
@@ -81,6 +81,17 @@
   not_if {File.exists?("/etc/ceilometer/policy.json")}
 end
 
+case node['platform']
+  when 'redhat', 'centos'
+  # RHEL YOUR DOING IT WRONG!
+  cookbook_file "/usr/share/ceilometer/ceilometer-dist.conf" do
+    source "ceilometer-dist.conf"
+    mode 0644
+    owner "ceilometer"
+    group "ceilometer"
+  end
+end
+
 notification_provider = node["ceilometer"]["notification"]["driver"]
 case notification_provider
 when "no_op"

diff --git a/templates/default/ceilometer.conf.erb b/templates/default/ceilometer.conf.erb
@@ -24,6 +24,9 @@ os_auth_url=<%= @keystone_auth_url %>
 
 
 ##### RABBITMQ #####
+rpc_backend=ceilometer.openstack.common.rpc.impl_kombu
+control_exchange=ceilometer
+
 rabbit_password=guest
 rabbit_hosts=<%= @rabbit_host %>:<%= @rabbit_port %>
 rabbit_ha_queues=<%= @rabbit_ha_queues %>