Revert "Update jakelong configuration for squid 3"

[chef.git] / roles / jakelong.rb

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index 3e2f23903c251f085ff2ac61cae9ab99516542f0..abe8d31bb3b477b29f160d4183e81fe83fc97636 100644 (file)
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -23,8 +23,8 @@ default_attributes(
     }
   },
   :squid => {
     }
   },
   :squid => {

-    :cache_mem => "700 MB",
-    :cache_dir => "coss /store/squid/coss-01 10000 block-size=8192 max-size=262144 membufs=30"
+    :cache_mem => "400 MB",
+    :cache_dir => "coss /store/squid/coss-01 7500 block-size=8192 max-size=262144 membufs=30"

   },
   :sysctl => {
     :kvm => {
   },
   :sysctl => {
     :kvm => {


@@ -39,7 +39,6 @@ default_attributes(
     :hdd_tune => {
       :comment => "Tune the queue for improved performance",
       :parameters => {
     :hdd_tune => {
       :comment => "Tune the queue for improved performance",
       :parameters => {

-        "block/xvda/queue/nr_requests" => "128",

         "block/xvda/queue/scheduler" => "deadline"
       }
     }
         "block/xvda/queue/scheduler" => "deadline"
       }
     }


@@ -47,9 +46,8 @@ default_attributes(
   :tilecache => {
     :tile_parent => "sanfrancisco.render.openstreetmap.org",
     :tile_siblings => [
   :tilecache => {
     :tile_parent => "sanfrancisco.render.openstreetmap.org",
     :tile_siblings => [

-      "nadder-01.openstreetmap.org",
-      "nadder-02.openstreetmap.org",

       "stormfly-02.openstreetmap.org",
       "stormfly-02.openstreetmap.org",

+      "ascalon.openstreetmap.org",

       "nepomuk.openstreetmap.org",
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org"
       "nepomuk.openstreetmap.org",
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org"