X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0badcb2c497364ea89544e45e6eac7f93fd48ae3..b02b631ee64ff4a5692cf9df29aa0714d430911c:/roles/odin.rb

diff --git a/roles/odin.rb b/roles/odin.rb
index 1968df094..9a19c5b2d 100644
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -4,49 +4,64 @@ description "Master role applied to odin"
 default_attributes(
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
+      :internal => {
         :interface => "bond0",
-        :role => :external,
-        :family => :inet,
-        :address => "130.225.254.123",
-        :prefix => "23",
-        :gateway => "130.225.254.97",
+        :role => :internal,
+        :inet => {
+          :address => "10.0.48.15"
+        },
         :bond => {
           :mode => "802.3ad",
-          :miimon => "100",
-          :xmithashpolicy => "layer3+4",
           :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2]
         }
       },
-      :external_ipv6 => {
-        :interface => "bond0",
+      :external => {
+        :interface => "bond0.3",
         :role => :external,
-        :family => :inet6,
-        :address => "2001:878:346::123",
-        :prefix => "64",
-        :gateway => "2001:878:346::97"
+        :inet => {
+          :address => "184.104.179.143"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::f"
+        }
+      }
+    }
+  },
+  :postgresql => {
+    :settings => {
+      :defaults => {
+        :effective_cache_size => "16GB"
       }
     }
   },
-  :squid => {
-    :version => "3",
-    :cache_mem => "14000 MB",
-    :cache_dir => "rock /store/squid/rock-01 128000 slot-size=4096 max-size=262144"
+  :sysctl => {
+    :postgres => {
+      :comment => "Increase shared memory for postgres",
+      :parameters => {
+        "kernel.shmmax" => 9 * 1024 * 1024 * 1024,
+        "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
+      }
+    }
   },
-  :tilecache => {
-    :tile_parent => "aalborg.render.openstreetmap.org",
-    :tile_siblings => [
-      "trogdor.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "gorynych.openstreetmap.org"
-    ]
+  :tile => {
+    :database => {
+      :cluster => "16/main",
+      :postgis => "3"
+    },
+    :mapnik => "3.1",
+    :styles => {
+      :default => {
+        :tile_directories => [
+          { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
+        ]
+      }
+    }
   }
 )
 
 run_list(
-  "role[dotsrc]",
-  "role[tilecache]"
+  "role[equinix-ams]",
+  "role[tile]"
 )