Make bond configuration more robust

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

diff --git a/roles/spike-06.rb b/roles/spike-06.rb
index 6be7da43dec7dfb0d44d81c971f256eb8684505d..b5d84e6a61378c234a07e9c27d2528396acf42bc 100644 (file)
--- a/roles/spike-06.rb
+++ b/roles/spike-06.rb
@@ -5,26 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
   :networking => {
     :interfaces => {
       :internal => {

-        :interface => "bond0",
-        :role => :internal,

         :inet => {
         :inet => {

-          :address => "10.0.48.11"
+          :address => "10.0.48.6"

         },
         :bond => {
         },
         :bond => {

-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",

           :slaves => %w[eno1 eno2]
         }
       },
           :slaves => %w[eno1 eno2]
         }
       },

-      :external => {
-        :interface => "bond0.3",
-        :role => :external,
+      :henet => {

         :inet => {
         :inet => {

-          :address => "184.104.179.139"
+          :address => "184.104.179.134"

         },
         :inet6 => {
         },
         :inet6 => {

-          :address => "2001:470:1:fa1::b"
+          :address => "2001:470:1:fa1::6"
+        }
+      },
+      :equinix => {
+        :inet => {
+          :address => "82.199.86.102"
+        },
+        :inet6 => {
+          :address => "2001:4d78:500:5e3::6"

         }
       }
     }
         }
       }
     }


@@ -32,7 +33,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[equinix-ams]",
+  "role[equinix-ams-public]",

   "role[hp-g9]",
   "role[web-frontend]",
   "role[web-statistics]",
   "role[hp-g9]",
   "role[web-frontend]",
   "role[web-statistics]",