X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/8fc1d48820c7278ad111f4b965e71c08fc1f8a29..2835205c501da417ff80ce4f06dc32d14c8c38bb:/roles/odin.rb

diff --git a/roles/odin.rb b/roles/odin.rb
index ad003331c..a7f836e18 100644
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -4,26 +4,28 @@ description "Master role applied to odin"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.15",
+        :inet => {
+          :address => "10.0.48.15"
+        },
         :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2]
         }
       },
-      :external_ipv4 => {
+      :external => {
         :interface => "bond0.2",
         :role => :external,
-        :family => :inet,
-        :address => "130.117.76.15"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:F"
+        :inet => {
+          :address => "130.117.76.15"
+        },
+        :inet6 => {
+          :address => "2001:978:2:2c::172:f"
+        }
       }
     }
   },
@@ -47,10 +49,10 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "12/main",
-      :postgis => "3",
-      :mapnik => "3.1"
+      :cluster => "14/main",
+      :postgis => "3"
     },
+    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [
@@ -62,6 +64,6 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix]",
+  "role[equinix-ams]",
   "role[tile]"
 )