X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/95aa82e2ca5501be6c311bd8d5e06d084514ccc9..2cd6a527ccf654edd83ce73cbd897f900e3537ef:/roles/ascalon.rb

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index e5086064d..481fc50e2 100644
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -2,8 +2,10 @@ name "ascalon"
 description "Master role applied to ascalon"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "18g"
+  },
   :networking => {
-    :netplan => true,
     :interfaces => {
       :external_ipv4 => {
         :interface => "eno1",
@@ -16,13 +18,20 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "16000 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "16384 MB",
+    :cache_dir => [
+      "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
+      "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
+    ]
   },
   :tilecache => {
     :tile_parent => "montreal.render.openstreetmap.org",
     :tile_siblings => [
       "stormfly-02.openstreetmap.org",
+      "azure.openstreetmap.org",
       "jakelong.openstreetmap.org"
     ]
   }