From 641f4603115a1b6346e2c81942167d42dcd4e2cc Mon Sep 17 00:00:00 2001 From: Simo Kinnunen Date: Thu, 8 Aug 2013 15:42:06 +0900 Subject: [PATCH] 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). --- libraries/default.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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?