Merge pull request #282 from opsline/281-environment-agent-search

agent should search for opscode server in its own environment
michaelklishin · May 15, 2016 · f70f619 · f70f619
2 parents d9ba305 + 7ba2b9b
commit f70f619
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/recipes/opscenter_agent_datastax.rb b/recipes/opscenter_agent_datastax.rb
@@ -25,7 +25,8 @@
 unless server_ip && !node['cassandra']['opscenter']['agent']['use_chef_search']
 
   unless Chef::Config[:solo]
-    search_results = search(:node, "roles:#{node['cassandra']['opscenter']['agent']['server_role']}")
+    search_results = search(:node, "chef_environment:#{node.chef_environment} "\
+      "AND roles:#{node['cassandra']['opscenter']['agent']['server_role']}")
     if !search_results.empty?
       server_ip = search_results[0]['ipaddress']
     else

diff --git a/recipes/opscenter_agent_tarball.rb b/recipes/opscenter_agent_tarball.rb
@@ -30,7 +30,8 @@
 unless server_ip && !node['cassandra']['opscenter']['agent']['use_chef_search']
 
   unless Chef::Config[:solo]
-    search_results = search(:node, "roles:#{node['cassandra']['opscenter']['agent']['server_role']}")
+    search_results = search(:node, "chef_environment:#{node.chef_environment} "\
+      "AND roles:#{node['cassandra']['opscenter']['agent']['server_role']}")
     if !search_results.empty?
       server_ip = search_results[0]['ipaddress']
     else