Switch chrysophylax, simurgh, vipertooth and viserion to squid 4

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

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

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


@@ -23,8 +26,14 @@ default_attributes(
     }
   },
   :squid => {
     }
   },
   :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 => "zurich.render.openstreetmap.org",
   },
   :tilecache => {
     :tile_parent => "zurich.render.openstreetmap.org",

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

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

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


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

-    :cache_mem => "6400 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"
+    ]

   },
   :nginx => {
     :cache => {
   },
   :nginx => {
     :cache => {

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

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

   :location => "Kiev, Ukraine",
   :networking => {
     :interfaces => {
   :location => "Kiev, Ukraine",
   :networking => {
     :interfaces => {


@@ -24,8 +27,14 @@ default_attributes(
     }
   },
   :squid => {
     }
   },
   :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 => "kiev.render.openstreetmap.org",
   },
   :tilecache => {
     :tile_parent => "kiev.render.openstreetmap.org",

diff --git a/roles/viserion.rb b/roles/viserion.rb
index 9b0211ce50c93efa3862ce985721bcd2f7c79e3f..4c8d31aa0199bd039519a100d942c28bdaaabfaa 100644 (file)
--- a/roles/viserion.rb
+++ b/roles/viserion.rb
@@ -7,6 +7,9 @@ default_attributes(
       :anovak => { :status => :administrator }
     }
   },
       :anovak => { :status => :administrator }
     }
   },

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

   :location => "Pula, Croatia",
   :munin => {
     :allow => ["193.198.233.210"]
   :location => "Pula, Croatia",
   :munin => {
     :allow => ["193.198.233.210"]


@@ -38,8 +41,14 @@ default_attributes(
     ]
   },
   :squid => {
     ]
   },
   :squid => {

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