From: Tom Hughes <tom@compton.nu>
Date: Mon, 16 Oct 2017 17:45:09 +0000 (+0100)
Subject: Tune bonding on odin
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/a12bd631f0eed60f140864d7fbc1b61b54d17b43

Tune bonding on odin
---

diff --git a/cookbooks/networking/templates/default/interfaces.erb b/cookbooks/networking/templates/default/interfaces.erb
index 7ffd456de..d0d4dd7c8 100644
--- a/cookbooks/networking/templates/default/interfaces.erb
+++ b/cookbooks/networking/templates/default/interfaces.erb
@@ -50,6 +50,9 @@ iface <%= interface[:interface] %> <%= interface[:family] %> static
       bond-miimon <%= interface[:bond][:miimon] || 100 %>
 <% if interface[:bond][:xmithashpolicy] -%>
       bond_xmit_hash_policy <%= interface[:bond][:xmithashpolicy] %>
+<% end -%>
+<% if interface[:bond][:lacprate] -%>
+      bond-lacp-rate <%= interface[:bond][:lacprate] %>
 <% end -%>
       bond-downdelay <%= interface[:bond][:downdelay] || 200 %>
       bond-updelay <%= interface[:bond][:updelay] || 200 %>
diff --git a/roles/odin.rb b/roles/odin.rb
index dc5a612d3..aa5700e32 100644
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -12,6 +12,10 @@ default_attributes(
         :prefix => "23",
         :gateway => "130.225.254.97",
         :bond => {
+          :mode => "802.3ad",
+          :miimon => "100",
+          :xmithashpolicy => "layer3+4",
+          :lacprate => "fast",
           :slaves => %w[eno1 eno2]
         }
       },