X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/cefb1fe9134e29ef41a021dc824d291407c94cb6..0c79b5dbf9284104cb1ab66bd0673f9d41dd08bd:/cookbooks/logstash/recipes/default.rb

diff --git a/cookbooks/logstash/recipes/default.rb b/cookbooks/logstash/recipes/default.rb
index 34f731af2..e3261d0d1 100644
--- a/cookbooks/logstash/recipes/default.rb
+++ b/cookbooks/logstash/recipes/default.rb
@@ -76,17 +76,13 @@ end
 
 forwarders = []
 
-search(:node, "recipes:logstash\\:\\:forwarder").each do |forwarder|
-  forwarder.interfaces(:role => :external).map do |interface|
-    forwarders << interface[:address]
-  end
-end
+forwarders << search(:node, "recipes:logstash\\:\\:forwarder").collect do |forwarder|
+  forwarder.ipaddresses(:role => :external)
+end.flatten
 
-search(:node, "roles:gateway").each do |forwarder|
-  forwarder.interfaces(:role => :external).map do |interface|
-    forwarders << interface[:address]
-  end
-end
+forwarders << search(:node, "roles:gateway").collect do |forwarder|
+  forwarder.ipaddresses(:role => :external)
+end.flatten
 
 firewall_rule "accept-logstash" do
   action :accept