X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/540e3bfef3a066bc85cb5ecf8d7ed1e2a88777fe..f29f56d40d9e453645a1e100e2fc7c547b091efc:/roles/odin.rb

diff --git a/roles/odin.rb b/roles/odin.rb
index abe2780ff..b835c456d 100644
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -4,26 +4,52 @@ 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_cogent => {
         :interface => "bond0.2",
         :role => :external,
-        :family => :inet,
-        :address => "130.117.76.15"
+        :source_route_table => 100,
+        :inet => {
+          :address => "130.117.76.15",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
+        },
+        :inet6 => {
+          :address => "2001:978:2:2c::172:f",
+          :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:F"
+        :metric => 150,
+        :source_route_table => 150,
+        :inet => {
+          :address => "184.104.179.143",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::f",
+          :prefix => "64",
+          :gateway => "2001:470:1:fa1::1"
+        }
       }
     }
   },
@@ -47,12 +73,12 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "12/main",
+      :cluster => "14/main",
       :postgis => "3"
     },
+    :mapnik => "3.1",
     :styles => {
       :default => {
-        :revision => "v5.0.0",
         :tile_directories => [
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]
@@ -62,6 +88,6 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix]",
+  "role[equinix-ams]",
   "role[tile]"
 )