Make bond configuration more robust

[chef.git] / roles / spike-06.rb

diff --git a/roles/spike-06.rb b/roles/spike-06.rb
index 251baccd287425adb50de6a22a030e3fe69147d3..b5d84e6a61378c234a07e9c27d2528396acf42bc 100644 (file)
--- a/roles/spike-06.rb
+++ b/roles/spike-06.rb
@@ -5,37 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.48.6"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2]
         }
       },
-      :external_he => {
-        :interface => "bond0.3",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.179.134",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.134"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::6"
         }
       },
-      :external => {
-        :interface => "bond0.103",
-        :role => :external,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "82.199.86.102",
-          :prefix => "27",
-          :gateway => "82.199.86.97"
+          :address => "82.199.86.102"
+        },
+        :inet6 => {
+          :address => "2001:4d78:500:5e3::6"
         }
       }
     }
@@ -43,7 +33,7 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-ams]",
+  "role[equinix-ams-public]",
   "role[hp-g9]",
   "role[web-frontend]",
   "role[web-statistics]",