From: Simo Kinnunen <simo@shoqolate.com>
Date: Thu, 8 Aug 2013 06:42:06 +0000 (+0900)
Subject: Use 'roles:' instead of 'role:' in mon search so that expanded runlists are included... 
X-Git-Tag: v0.2.0~21^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F59%2Fhead;p=ceph-cookbooks.git

Use 'roles:' instead of 'role:' in mon search so that expanded runlists are included in the search (i.e. you'll be able to to include the ceph-mon role in another role).
---

diff --git a/libraries/default.rb b/libraries/default.rb
index fec3c17..5367744 100644
--- 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?