clean up searches on role directly

jnewland · Jun 1, 2011 · d10940e · d10940e
1 parent 6a42470
commit d10940e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/application/recipes/django.rb b/application/recipes/django.rb
@@ -107,7 +107,7 @@
     dbm = node
   else
   # Find the database master
-    results = search(:node, "run_list:role\\[#{app["database_master_role"][0]}\\] AND chef_environment:#{node.chef_environment}", nil, 0, 1)
+    results = search(:node, "role:#{app["database_master_role"][0]} AND chef_environment:#{node.chef_environment}", nil, 0, 1)
     rows = results[0]
     if rows.length == 1
       dbm = rows[0]

diff --git a/application/recipes/java_webapp.rb b/application/recipes/java_webapp.rb
@@ -75,7 +75,7 @@
     dbm = node
   else
   # Find the database master
-    results = search(:node, "run_list:role\\[#{app["database_master_role"][0]}\\] AND chef_environment:#{node.chef_environment}", nil, 0, 1)
+    results = search(:node, "role:#{app["database_master_role"][0]} AND chef_environment:#{node.chef_environment}", nil, 0, 1)
     rows = results[0]
     if rows.length == 1
       dbm = rows[0]

diff --git a/application/recipes/php.rb b/application/recipes/php.rb
@@ -98,7 +98,7 @@
     dbm = node
   else
   # Find the database master
-    results = search(:node, "run_list:role\\[#{app['database_master_role'][0]}\\] AND chef_environment:#{node.chef_environment}", nil, 0, 1)
+    results = search(:node, "role:#{app["database_master_role"][0]} AND chef_environment:#{node.chef_environment}", nil, 0, 1)
     rows = results[0]
     if rows.length == 1
       dbm = rows[0]

diff --git a/application/recipes/rails.rb b/application/recipes/rails.rb
@@ -103,7 +103,7 @@
     dbm = node
   else
   # Find the database master
-    results = search(:node, "run_list:role\\[#{app["database_master_role"][0]}\\] AND chef_environment:#{node.chef_environment}", nil, 0, 1)
+    results = search(:node, "role:#{app["database_master_role"][0]} AND chef_environment:#{node.chef_environment}", nil, 0, 1)
     rows = results[0]
     if rows.length == 1
       dbm = rows[0]