From 87c328964f8edf88695c45008e6b5573d3320000 Mon Sep 17 00:00:00 2001
From: git-harry <git-harry@live.co.uk>
Date: Wed, 22 Oct 2014 11:51:48 +0100
Subject: [PATCH 1/2] Require v3.3.5 which is not in Epel

---
 recipes/server.rb | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/recipes/server.rb b/recipes/server.rb
index 265f6ff..b0e9438 100644
--- a/recipes/server.rb
+++ b/recipes/server.rb
@@ -38,14 +38,6 @@
 # TODO(shep): Should probably use Opscode::OpenSSL::Password for default_password
 #
 
-# default to using distro-provided packages for RHEL based systems since 3.x
-# is in EPEL.  Otherwise we need to get it from rabbitmq.com
-if platform_family?("rhel","fedora")
-  node.override["rabbitmq"]["use_distro_version"] = true
-else
-  node.override["rabbitmq"]["use_distro_version"] = false
-end
-
 # need to build out [rabbitmq][cluster_disk_nodes] from a search of the nodes
 # that include the rabbitmq-server role
 node.set["rabbitmq"]["cluster_disk_nodes"] = osops_search(search_string="rabbitmq-server",one_or_all=:all,include_me=true,order=[:role]).map(&:hostname).map! { |k| "rabbit@#{k}" }

From 5e1f89c2d67ff38bcf1cdf037623548721f8dcee Mon Sep 17 00:00:00 2001
From: git-harry <git-harry@live.co.uk>
Date: Wed, 22 Oct 2014 14:35:13 +0100
Subject: [PATCH 2/2] Adjust keepalived monitoring script to use pgrep

---
 attributes/default.rb | 2 ++
 recipes/server.rb     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/attributes/default.rb b/attributes/default.rb
index 697b29e..4892f6b 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -7,6 +7,7 @@
   default["rabbitmq"]["platform"] = {                               # node_attribute
     "rabbitmq_service" => "rabbitmq-server",
     "rabbitmq_service_regex" => "/etc/rabbitmq/rabbitmq",
+    "pgrep_bin" => "/usr/bin/pgrep",
     "service_bin" => "/sbin/service",
     "package_options" => ""
   }
@@ -14,6 +15,7 @@
   default["rabbitmq"]["platform"] = {                               # node_attribute
     "rabbitmq_service" => "rabbitmq-server",
     "rabbitmq_service_regex" => "/etc/rabbitmq/rabbitmq",
+    "pgrep_bin" => "/usr/bin/pgrep",
     "service_bin" => "/usr/sbin/service",
     "package_options" => "-o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef'"
   }
diff --git a/recipes/server.rb b/recipes/server.rb
index b0e9438..63a708d 100644
--- a/recipes/server.rb
+++ b/recipes/server.rb
@@ -92,7 +92,7 @@
   end
 
   keepalived_chkscript "rabbitmq" do
-    script "#{platform_options["service_bin"]} rabbitmq-server status"
+    script "#{platform_options["pgrep_bin"]} rabbitmq-server"
     interval 5
     action :create
   end