Update bundle

[chef.git] / roles / waima.rb

diff --git a/roles/waima.rb b/roles/waima.rb
index 32321cc90744b36031353648ac47c7027e3e45e7..e614caa111dbfae706714c1dbad46a5436972087 100644 (file)
--- a/roles/waima.rb
+++ b/roles/waima.rb
@@ -2,6 +2,9 @@ name "waima"
 description "Master role applied to waima"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "12g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -16,17 +19,17 @@ 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 => "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 => "hamilton.render.openstreetmap.org",
-    :tile_siblings => [
-      "tuatara.openstreetmap.org",
-      "longma.openstreetmap.org",
-      "storfly-02.openstreetmap.org",
-      "jakelong.openstreetmap.org"
-    ]
+    :tile_parent => "hamilton.render.openstreetmap.org"
   }
 )