X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/fb74c967e5abb0f7c1db92a2dcd10d8ecd3be933..15c5f64e3607c5d84383af0f8a08137f3fb8a9f6:/roles/spike-07.rb

diff --git a/roles/spike-07.rb b/roles/spike-07.rb
index c5045fc6e..7db381934 100644
--- a/roles/spike-07.rb
+++ b/roles/spike-07.rb
@@ -4,31 +4,35 @@ description "Master role applied to spike-07"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.12",
+        :inet => {
+          :address => "10.0.48.12"
+        },
         :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2]
         }
       },
-      :external_ipv4 => {
-        :interface => "bond0.2",
+      :external => {
+        :interface => "bond0.3",
         :role => :external,
-        :family => :inet,
-        :address => "130.117.76.12"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:C"
+        :inet => {
+          :address => "184.104.179.140"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::c"
+        }
       }
     }
   }
 )
 
 run_list(
-  "role[equinix]"
+  "role[equinix-ams]",
+  "role[hp-g9]",
+  "role[web-frontend]"
 )