Merge remote-tracking branch 'github/pull/559'

[chef.git] / roles / tabaluga.rb

diff --git a/roles/tabaluga.rb b/roles/tabaluga.rb
index 8645291918de796b0a19b15323b557898658e735..8094e63c0d8d880676fda2956deec0bb2bd75ed6 100644 (file)
--- a/roles/tabaluga.rb
+++ b/roles/tabaluga.rb
@@ -2,6 +2,10 @@ name "tabaluga"
 description "Master role applied to tabaluga"
 
 default_attributes(
+  :dhcpd => {
+    :first_address => "10.0.62.1",
+    :last_address => "10.0.62.254"
+  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
@@ -10,6 +14,9 @@ default_attributes(
         :family => :inet,
         :address => "10.0.48.14",
         :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2]
         }
       },
@@ -30,7 +37,8 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix]",
+  "role[equinix-ams]",
   "role[hp-g9]",
-  "role[wiki]"
+  "role[wiki]",
+  "recipe[dhcpd]"
 )