From c83cb6d0316f661870dce044afab26b536f9db6c Mon Sep 17 00:00:00 2001
From: Khaled Janania <kj185064@ncr.com>
Date: Tue, 12 May 2015 13:55:32 -0400
Subject: [PATCH] Adding patterns to catch instances where the node name is
 surrounded by single-quotes

---
 providers/cluster.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/providers/cluster.rb b/providers/cluster.rb
index 2e3ea371..05e98f0e 100644
--- a/providers/cluster.rb
+++ b/providers/cluster.rb
@@ -78,7 +78,7 @@ def current_cluster_name(cluster_status)
 
 # Get running nodes
 def running_nodes(cluster_status)
-  pattern = '({running_nodes,\[)(.*?)(\]})'
+  pattern = '({running_nodes,\[\'*)(.*?)(\'*\]})'
   result = match_pattern_cluster_status(cluster_status, pattern)
   Chef::Log.debug("[rabbitmq_cluster] running_nodes : #{result}")
   result.split(',')
@@ -86,7 +86,7 @@ def running_nodes(cluster_status)
 
 # Get disc nodes
 def disc_nodes(cluster_status)
-  pattern = '({disc,\[)(.*?)(\]})'
+  pattern = '({disc,\[\'*)(.*?)(\'*\]})'
   result = match_pattern_cluster_status(cluster_status, pattern)
   Chef::Log.debug("[rabbitmq_cluster] disc_nodes : #{result}")
   result.split(',')
@@ -94,7 +94,7 @@ def disc_nodes(cluster_status)
 
 # Get ram nodes
 def ram_nodes(cluster_status)
-  pattern = '({ram,\[)(.*?)(\]})'
+  pattern = '({ram,\[\'*)(.*?)(\'*\]})'
   result = match_pattern_cluster_status(cluster_status, pattern)
   Chef::Log.debug("[rabbitmq_cluster] ram_nodes : #{result}")
   result.split(',')
@@ -109,6 +109,7 @@ def node_name
   cmd.run_command
   cmd.error!
   result = cmd.stdout.chomp
+  result.gsub!(/'/, '')
   Chef::Log.debug("[rabbitmq_cluster] node name : #{result}")
   result
 end