Push external network config in Amsterdam down to the hosts

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

diff --git a/roles/spike-06.rb b/roles/spike-06.rb
index 272ddcd5df00eabe30f698a9fb6b13d630552f2d..73a3802b16248f5634a32f5c868ae1c431ab7a8e 100644 (file)
--- a/roles/spike-06.rb
+++ b/roles/spike-06.rb
@@ -4,31 +4,44 @@ description "Master role applied to spike-06"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

-      :internal_ipv4 => {
+      :internal => {

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

-        :family => :inet,
-        :address => "10.0.48.11",
+        :inet => {
+          :address => "10.0.48.11"
+        },

         :bond => {
         :bond => {

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

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

-      :external_ipv4 => {
+      :external => {

         :interface => "bond0.2",
         :role => :external,
         :interface => "bond0.2",
         :role => :external,

-        :family => :inet,
-        :address => "130.117.76.11"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:B"
+        :inet => {
+          :address => "130.117.76.11",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
+        },
+        :inet6 => {
+          :address => "2001:978:2:2c::172:b",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
+        }

       }
     }
   }
 )
 
 run_list(
       }
     }
   }
 )
 
 run_list(

-  "role[equinix]"
+  "role[equinix-ams]",
+  "role[hp-g9]",
+  "role[web-frontend]",
+  "role[web-statistics]",
+  "role[web-cleanup]"

 )
 )