Correct disk cache size on drogon and gorynych

[chef.git] / roles / fume.rb

diff --git a/roles/fume.rb b/roles/fume.rb
index a023e8a04fb0c6d7958442cdfb0b7dcc8c94fd88..e827205977b0f98f8eb0532b809cf602d73c74b7 100644 (file)
--- a/roles/fume.rb
+++ b/roles/fume.rb
@@ -2,6 +2,9 @@ name "fume"
 description "Master role applied to fume"
 
 default_attributes(
 description "Master role applied to fume"
 
 default_attributes(

+  :hardware => {
+    :shm_size => "6g"
+  },

   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {


@@ -15,8 +18,14 @@ default_attributes(
     }
   },
   :squid => {
     }
   },
   :squid => {

+    :version => 4,

     :cache_mem => "4096 MB",
     :cache_mem => "4096 MB",

-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :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 => "pilsen.render.openstreetmap.org",
   },
   :tilecache => {
     :tile_parent => "pilsen.render.openstreetmap.org",