Switch nidhogg, ridgeback and rimfaxe to squid 4

diff --git a/roles/nidhogg.rb b/roles/nidhogg.rb
index e173757659934d92465ffda7c7181eabe9b4caf1..c223168cdfa8e6af55b00c366960d6a4d07931f6 100644 (file)
--- a/roles/nidhogg.rb
+++ b/roles/nidhogg.rb
@@ -2,6 +2,9 @@ name "nidhogg"
 description "Master role applied to nidhogg"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "14g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -23,8 +26,14 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "7500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "12288 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 => "sweden.render.openstreetmap.org",

diff --git a/roles/ridgeback.rb b/roles/ridgeback.rb
index 5fa68580d9ef4d0533a8eb9eea8f6570797cff2f..4da85ce2b7c934b0ead3ad596a6251080bca199c 100644 (file)
--- a/roles/ridgeback.rb
+++ b/roles/ridgeback.rb
@@ -2,6 +2,9 @@ name "ridgeback"
 description "Master role applied to ridgeback"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "10g"
+  },
   :munin => {
     :plugins => {
       :ipmi_fans => {
@@ -46,8 +49,14 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "5500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "8192 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 => "oslo.render.openstreetmap.org",

diff --git a/roles/rimfaxe.rb b/roles/rimfaxe.rb
index 1b6b34cfbf02249543c92f47b5289cddb03bd37e..bf06a94bc941484163bcd765097ca10ec1f74118 100644 (file)
--- a/roles/rimfaxe.rb
+++ b/roles/rimfaxe.rb
@@ -2,6 +2,9 @@ name "rimfaxe"
 description "Master role applied to rimfaxe"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "12g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -23,8 +26,14 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "7000 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "10240 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 => "aalborg.render.openstreetmap.org",