]> git.openstreetmap.org Git - chef.git/blobdiff - cookbooks/logstash/recipes/default.rb
Fix installation of SST tools
[chef.git] / cookbooks / logstash / recipes / default.rb
index 34f731af29734698f9c9dddc0a157a32ba54bb8b..bbe8450214f4168e0a770c47188987e6dbda7c1f 100644 (file)
@@ -23,7 +23,7 @@ include_recipe "networking"
 keys = data_bag_item("logstash", "keys")
 
 package %w[
-  openjdk-8-jre-headless
+  openjdk-11-jre-headless
   logstash
 ]
 
@@ -77,15 +77,11 @@ end
 forwarders = []
 
 search(:node, "recipes:logstash\\:\\:forwarder").each do |forwarder|
-  forwarder.interfaces(:role => :external).map do |interface|
-    forwarders << interface[:address]
-  end
+  forwarders.append(forwarder.ipaddresses(:role => :external))
 end
 
 search(:node, "roles:gateway").each do |forwarder|
-  forwarder.interfaces(:role => :external).map do |interface|
-    forwarders << interface[:address]
-  end
+  forwarders.append(forwarder.ipaddresses(:role => :external))
 end
 
 firewall_rule "accept-logstash" do