Make bond configuration more robust

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

diff --git a/roles/spike-07.rb b/roles/spike-07.rb
index 20f16fec5533ec03c4bb07f21a28eae1b7015080..1664329195b938039f0ac5ebfd803c07a1bcd8a9 100644 (file)
--- a/roles/spike-07.rb
+++ b/roles/spike-07.rb
@@ -5,50 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
-          :address => "10.0.48.12"
+          :address => "10.0.48.7"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2]
         }
       },
-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "130.117.76.12",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
+          :address => "184.104.179.135"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:c",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
+          :address => "2001:470:1:fa1::7"
         }
       },
-      :external => {
-        :interface => "bond0.3",
-        :role => :external,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "184.104.179.140",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "82.199.86.103"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::c",
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:4d78:500:5e3::7"
         }
       }
     }
@@ -56,7 +33,7 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-ams]",
+  "role[equinix-ams-public]",
   "role[hp-g9]",
   "role[web-frontend]"
 )