Remove sibling lists for tile caches

[chef.git] / roles / ridgeback.rb

diff --git a/roles/ridgeback.rb b/roles/ridgeback.rb
index 90ae277e165f6240899bacda82b37c082b0ea1d8..42926b94606631deec400a09d8c33ce9cd4c530b 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,20 +49,17 @@ default_attributes(
     }
   },
   :squid => {
-    :version => "3",
-    :cache_mem => "5500 MB",
-    :cache_dir => "rock /store/squid/rock-01 128000 slot-size=4096 max-size=262144"
+    :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",
-    :tile_siblings => [
-      "trogdor.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "nepomuk.openstreetmap.org",
-      "gorynych.openstreetmap.org",
-      "simurgh.openstreetmap.org"
-    ]
+    :tile_parent => "oslo.render.openstreetmap.org"
   }
 )