Share more code inside get_mon_nodes.

Only call search() in one place, just build different search strings
for Crowbar and non-Crowbar.

diff --git a/libraries/default.rb b/libraries/default.rb
index 59bc8bdb77f0f6f39ff9c9f916a154fc83ec6b5e..a34db4cea2840323d8a4e6f6fa2c61d126a6a05e 100644 (file)
--- a/libraries/default.rb
+++ b/libraries/default.rb
@@ -3,17 +3,16 @@ def is_crowbar?()
 end
 
 def get_mon_nodes()
-  mons = []
-
   if is_crowbar?
     mon_roles = search(:role, 'name:crowbar-* AND run_list:role\[ceph-mon\]')
     if not mon_roles.empty?
       search_string = mon_roles.map { |role_object| "role:"+role_object.name }.join(' OR ')
-      mons += search(:node, "(#{search_string}) AND ceph_config_environment:#{node['ceph']['config']['environment']}")
+      search_string = "(#{search_string}) AND ceph_config_environment:#{node['ceph']['config']['environment']}"
     end
   else
-    mons += search(:node, "role:ceph-mon AND chef_environment:#{node.chef_environment}")
+    search_string = "role:ceph-mon AND chef_environment:#{node.chef_environment}"
   end
+  mons = search(:node, search_string)
   return mons
 end