X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/77c15edb86c1c5a78904db4da60a4806cc3e1bb6..efeea515bf139320dae0e0ce7a0dae16928a115b:/roles/spike-06.rb?ds=sidebyside

diff --git a/roles/spike-06.rb b/roles/spike-06.rb
index 8ecaeecb7..42345259e 100644
--- a/roles/spike-06.rb
+++ b/roles/spike-06.rb
@@ -4,32 +4,61 @@ description "Master role applied to spike-06"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.11",
+        :inet => {
+          :address => "10.0.48.11"
+        },
         :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2]
         }
       },
-      :external_ipv4 => {
+      :external_cogent => {
         :interface => "bond0.2",
         :role => :external,
-        :family => :inet,
-        :address => "130.117.76.11"
+        :source_route_table => 100,
+        :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" }
+          }
+        }
       },
-      :external_ipv6 => {
-        :interface => "bond0.2",
+      :external => {
+        :interface => "bond0.3",
         :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:B"
+        :metric => 150,
+        :source_route_table => 150,
+        :inet => {
+          :address => "184.104.179.139",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::b",
+          :prefix => "64",
+          :gateway => "2001:470:1:fa1::1"
+        }
       }
     }
   }
 )
 
 run_list(
-  "role[equinix]",
-  "role[hp-g9]"
+  "role[equinix-ams]",
+  "role[hp-g9]",
+  "role[web-frontend]",
+  "role[web-statistics]",
+  "role[web-cleanup]"
 )