X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/85625531ef385b5be17fe2b0de369e3f1af2527b..ddb5218ad7630363b0c6952c7fa8a2e947deff1b:/roles/spike-01.rb?ds=sidebyside

diff --git a/roles/spike-01.rb b/roles/spike-01.rb
index 05fcf144a..5f048e341 100644
--- a/roles/spike-01.rb
+++ b/roles/spike-01.rb
@@ -4,45 +4,35 @@ description "Master role applied to spike-01"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.6",
+        :inet => {
+          :address => "10.0.64.3"
+        },
         :bond => {
-          :slaves => %w[eth0 eth1]
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
-      :external_ipv4 => {
-        :interface => "bond0.3",
+      :external => {
+        :interface => "bond0.101",
         :role => :external,
-        :family => :inet,
-        :address => "130.117.76.6"
-      },
-      # :external_ipv6 => {
-      #   :interface => "bond0.3",
-      #   :role => :external,
-      #   :family => :inet6,
-      #   :address => "2001:978:2:2C::172:1006"
-      # }
-    }
-  },
-  :sysctl => {
-    :ipv6_autoconf => {
-      :comment => "Disable IPv6 auto-configuration on internal interface",
-      :parameters => {
-        "net.ipv6.conf.eth0.autoconf" => "0",
-        "net.ipv6.conf.eth0.accept_ra" => "0"
+        :inet => {
+          :address => "184.104.226.99"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::3"
+        }
       }
     }
   }
 )
 
 run_list(
-  "role[ic]",
-  "role[hp-dl360-g6]",
-  "role[web-frontend]",
-  # "role[web-gpximport]",
-  # "role[web-statistics]",
-  # "role[web-cleanup]"
+  "role[equinix-dub]",
+  "role[hp-g9]",
+  "role[web-frontend]"
 )