[COOK-1317] RabbitMQ cookbook is installing a very old / incorrect version of RabbitMQ

attributes/default.rb

@@ -23,6 +23,7 @@
 default[:rabbitmq][:cluster] = false
 default[:rabbitmq][:cluster_disk_nodes] = []
 default[:rabbitmq][:erlang_cookie] = 'AnyAlphaNumericStringWillDo'
+default[:rabbitmq][:erlang_cookie_path] = '/var/lib/rabbitmq/.erlang.cookie'
 
 #ssl
 default[:rabbitmq][:ssl] = false

recipes/default.rb

@@ -4,6 +4,7 @@
 #
 # Copyright 2009, Benjamin Black
 # Copyright 2009-2011, Opscode, Inc.
+# Copyright 2012, Kevin Nuckolls <kevin.nuckolls@gmail.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,10 +19,6 @@
 # limitations under the License.
 #
 
-# rabbitmq-server is not well-behaved as far as managed services goes
-# we'll need to add a LWRP for calling rabbitmqctl stop
-# while still using /etc/init.d/rabbitmq-server start
-# because of this we just put the rabbitmq-env.conf in place and let it rip
 
 include_recipe "erlang::default"
 
@@ -50,7 +47,10 @@
     components ["main"]
     key "http://www.rabbitmq.com/rabbitmq-signing-key-public.asc"
     action :add
+    notifies :run, resources(:execute => "apt-get update"), :immediately
   end
+  # installs the required setsid command -- should be there by default but just in case
+  package "util-linux"
   package "rabbitmq-server"
 when "redhat", "centos", "scientific", "amazon"
   remote_file "/tmp/rabbitmq-server-#{node[:rabbitmq][:version]}-1.noarch.rpm" do
@@ -62,15 +62,28 @@
   end
 end
 
-if node[:rabbitmq][:cluster]
-    # If this already exists, don't do anything
-    # Changing the cookie will stil have to be a manual process
+if File.exists?(node[:rabbitmq][:erlang_cookie_path])
+  existing_erlang_key =  File.read(node[:rabbitmq][:erlang_cookie_path])
+else
+  existing_erlang_key = ""
+end
+
+if node[:rabbitmq][:cluster] and node[:rabbitmq][:erlang_cookie] != existing_erlang_key
+    execute "rabbitmq-stop" do
+      command "setsid /etc/init.d/rabbitmq-server stop"
+      action :run
+    end
+
     template "/var/lib/rabbitmq/.erlang.cookie" do
       source "doterlang.cookie.erb"
       owner "rabbitmq"
       group "rabbitmq"
       mode 0400
-      not_if { File.exists? "/var/lib/rabbitmq/.erlang.cookie" }
+    end
+
+    execute "rabbitmq-start" do
+      command "setsid /etc/init.d/rabbitmq-server start"
+      action :run
     end
 end
 
@@ -82,8 +95,17 @@
   notifies :restart, "service[rabbitmq-server]", :immediately
 end
 
+## You'll see setsid used in all the init statements in this cookbook. This 
+## is because there is a problem with the stock init script in the RabbitMQ
+## debian package (at least in 2.8.2) that makes it not daemonize properly 
+## when called from chef. The setsid command forces the subprocess into a state 
+## where it can daemonize properly. -Kevin (thanks to Daniel DeLeo for the help)
+
 service "rabbitmq-server" do
-  stop_command "/usr/sbin/rabbitmqctl stop"
+  start_command "setsid /etc/init.d/rabbitmq-server start"
+  stop_command "setsid /etc/init.d/rabbitmq-server stop"
+  restart_command "setsid /etc/init.d/rabbitmq-server restart"
+  status_command "setsid /etc/init.d/rabbitmq-server status"
   supports :status => true, :restart => true
   action [ :enable, :start ]
 end