Don't apply HP disk rules to disks not on HP controllers

[chef.git] / roles / naga.rb

diff --git a/roles/naga.rb b/roles/naga.rb
index 3582d5f156411167f236d0d58ef24dfca9488bba..280afe21ee8fd36cd1772301a0db95da79c9537d 100644 (file)
--- a/roles/naga.rb
+++ b/roles/naga.rb
@@ -10,17 +10,20 @@ default_attributes(
         :family => :inet,
         :address => "10.0.64.8",
         :bond => {
-          :slaves => %w[eno1 eno2]
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
       :external_ipv4 => {
-        :interface => "bond0.2",
+        :interface => "bond0.101",
         :role => :external,
         :family => :inet,
         :address => "184.104.226.104"
       },
       :external_ipv6 => {
-        :interface => "bond0.2",
+        :interface => "bond0.101",
         :role => :external,
         :family => :inet6,
         :address => "2001:470:1:b3b::8"
@@ -31,5 +34,10 @@ default_attributes(
 
 run_list(
   "role[equinix-dub]",
-  "role[hp-g9]"
+  "role[hp-g9]",
+  "role[subversion]",
+  "role[trac]",
+  "role[irc]",
+  "role[blogs]",
+  "role[munin]"
 )