X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/aa02df0d2f61fb4d1839e1e9fca1ec95c249572a..8c4afb2136d1954313dd5e880a186d0c29ccc71f:/cookbooks/networking/recipes/default.rb

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 67d7bcf3e..39611a9df 100644
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -25,7 +25,6 @@ require "ipaddr"
 node[:networking][:interfaces].each do |name, interface|
   if interface[:role] && (role = node[:networking][:roles][interface[:role]])
     if role[interface[:family]]
-      node.set[:networking][:interfaces][name][:method] = role[interface[:family]][:method]
       node.set[:networking][:interfaces][name][:prefix] = role[interface[:family]][:prefix]
       node.set[:networking][:interfaces][name][:gateway] = role[interface[:family]][:gateway]
     end
@@ -34,14 +33,12 @@ node[:networking][:interfaces].each do |name, interface|
     node.set[:networking][:interfaces][name][:zone] = role[:zone]
   end
 
-  node.set_unless[:networking][:interfaces][name][:method] = "static"
-
-  next unless interface[:address]
-
   prefix = node[:networking][:interfaces][name][:prefix]
 
+  # rubocop:disable Style/RedundantParentheses
   node.set[:networking][:interfaces][name][:netmask] = (~IPAddr.new(interface[:address]).mask(0)).mask(prefix)
   node.set[:networking][:interfaces][name][:network] = IPAddr.new(interface[:address]).mask(prefix)
+  # rubocop:enable Style/RedundantParentheses
 end
 
 template "/etc/network/interfaces" do