Add support for bonding and VLANs

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 8355b54c036e68d0b12d4d68e610e10c962c84d1..e23b1dae313b13beaed885d8edde69ed67d2fdca 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -22,7 +22,12 @@
 
 require "ipaddr"
 
 
 require "ipaddr"
 

+network_packages = []
+

 node[:networking][:interfaces].each do |name, interface|
 node[:networking][:interfaces].each do |name, interface|

+  network_packages |= ["vlan"] if interface[:interface] =~ /\.\d+$/
+  network_packages |= ["ifenslave"] if interface[:bond]
+

   if interface[:role] && (role = node[:networking][:roles][interface[:role]])
     if role[interface[:family]]
       node.set[:networking][:interfaces][name][:prefix] = role[interface[:family]][:prefix]
   if interface[:role] && (role = node[:networking][:roles][interface[:role]])
     if role[interface[:family]]
       node.set[:networking][:interfaces][name][:prefix] = role[interface[:family]][:prefix]


@@ -39,6 +44,8 @@ node[:networking][:interfaces].each do |name, interface|
   node.set[:networking][:interfaces][name][:network] = IPAddr.new(interface[:address]).mask(prefix)
 end
 
   node.set[:networking][:interfaces][name][:network] = IPAddr.new(interface[:address]).mask(prefix)
 end
 

+package network_packages
+

 template "/etc/network/interfaces" do
   source "interfaces.erb"
   owner "root"
 template "/etc/network/interfaces" do
   source "interfaces.erb"
   owner "root"

diff --git a/cookbooks/networking/templates/default/interfaces.erb b/cookbooks/networking/templates/default/interfaces.erb
index 50238cb5f885ff16cb55970d1c7173c4ceb9c9b7..1b3e1a9890a88e8db62cf78c8fa0523af64e70ca 100644 (file)
--- a/cookbooks/networking/templates/default/interfaces.erb
+++ b/cookbooks/networking/templates/default/interfaces.erb
@@ -31,6 +31,14 @@ iface <%= interface[:interface] %> <%= interface[:family] %> static
 <% if interface[:family] == "inet6" -%>
       autoconf  0
 <% end -%>
 <% if interface[:family] == "inet6" -%>
       autoconf  0
 <% end -%>

+<% if interface[:bond] -%>
+      bond-mode <%= interface[:bond][:mode] || "active-backup" %>
+      bond-slaves <%= interface[:bond][:slaves].join(" ") %>
+      bond-primary <%= interface[:bond][:slaves].first %>
+      bond-miimon <%= interface[:bond][:miimon] || 100 %>
+      bond-downdelay <%= interface[:bond][:downdelay] || 200 %>
+      bond-updelay <%= interface[:bond][:updelay] || 200 %>
+<% end -%>

 <% end -%>
 <% end -%>
 
 <% end -%>
 <% end -%>