X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b1b9d1a24cd4ec5bc9176af4342697a739db64e7..b173c492c728598a8ad0e7fcba23fd2a127f6e78:/roles/odin.rb

diff --git a/roles/odin.rb b/roles/odin.rb
index 9b7975aaf..8263b6e78 100644
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -4,39 +4,100 @@ 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 => {
-          :slaves => %w[eno1 eno2]
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1np0 eno2np1]
         }
       },
-      :external_ipv4 => {
-        :interface => "bond0.2",
+      :external => {
+        :interface => "bond0.3",
         :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 => "184.104.179.143"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::f"
+        }
       }
     }
   },
   :postgresql => {
-    :versions => ["10"],
     :settings => {
       :defaults => {
-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",
         :effective_cache_size => "16GB"
       }
     }
   },
+  :sysfs => {
+    :cpu_power_energy_perf_bias => {
+      :parameters => {
+        "devices/system/cpu/cpu0/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu1/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu2/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu3/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu4/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu5/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu6/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu7/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu8/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu9/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu10/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu11/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu12/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu13/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu14/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu15/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu16/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu17/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu18/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu19/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu20/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu21/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu22/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu23/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu24/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu25/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu26/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu27/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu28/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu29/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu30/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu31/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu32/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu33/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu34/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu35/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu36/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu37/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu38/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu39/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu40/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu41/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu42/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu43/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu44/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu45/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu46/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu47/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu48/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu49/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu50/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu51/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu52/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu53/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu54/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu55/power/energy_perf_bias" => "0"
+      }
+    }
+  },
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
@@ -48,10 +109,10 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "10/main",
-      :postgis => "2.4"
+      :cluster => "16/main",
+      :postgis => "3"
     },
-    :node_file => "/store/database/nodes",
+    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [
@@ -63,6 +124,6 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix]",
+  "role[equinix-ams]",
   "role[tile]"
 )