Use 'roles:' instead of 'role:' in mon search so that expanded runlists are included...

diff --git a/libraries/default.rb b/libraries/default.rb
index fec3c1789814480e832860331de981e2ee1514b0..5367744b9afea6d4f1be5ad58c79485252d09eef 100644 (file)
--- a/libraries/default.rb
+++ b/libraries/default.rb
@@ -9,11 +9,11 @@ def get_mon_nodes(extra_search=nil)
   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 ')
+      search_string = mon_roles.map { |role_object| "roles:"+role_object.name }.join(' OR ')
       search_string = "(#{search_string}) AND ceph_config_environment:#{node['ceph']['config']['environment']}"
     end
   else
-    search_string = "role:ceph-mon AND chef_environment:#{node.chef_environment}"
+    search_string = "roles:ceph-mon AND chef_environment:#{node.chef_environment}"
   end
 
   if not extra_search.nil?