From: git-harry <git-harry@live.co.uk>
Date: Thu, 26 Sep 2013 09:28:04 +0000 (+0100)
Subject: Change roles to role when searching for ceph-mon
X-Git-Tag: v0.2.0~10^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3f9e32e4369fc75a7500c66f374391bbd49a7423;p=ceph-cookbooks.git

Change roles to role when searching for ceph-mon

roles searches the expanded run list. This isn't
available for other nodes to search until the
run completes. This means you must run chef on
one mon at a time and your initial mons can only
be one mon. If more than one mon is used the
chef run get stuck trying to get the bootstrap
osd keyring.
---

diff --git a/libraries/default.rb b/libraries/default.rb
index 5367744..a3bd7fc 100644
--- a/libraries/default.rb
+++ b/libraries/default.rb
@@ -13,7 +13,7 @@ def get_mon_nodes(extra_search=nil)
       search_string = "(#{search_string}) AND ceph_config_environment:#{node['ceph']['config']['environment']}"
     end
   else
-    search_string = "roles:ceph-mon AND chef_environment:#{node.chef_environment}"
+    search_string = "role:ceph-mon AND chef_environment:#{node.chef_environment}"
   end
 
   if not extra_search.nil?