Explcitly disable IPv6 on the IC internal network

[chef.git] / cookbooks / networking / recipes / default.rb

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 477a15b240741795c392b88d10db8d0a5365a092..67d7bcf3e0ad667324e22fa87bffcd15c4a11c31 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -25,6 +25,7 @@ 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
@@ -33,6 +34,10 @@ 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]
 
   node.set[:networking][:interfaces][name][:netmask] = (~IPAddr.new(interface[:address]).mask(0)).mask(prefix)