Merge remote-tracking branch 'github/pull/183'

[chef.git] / roles / jakelong.rb

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index 3e2f23903c251f085ff2ac61cae9ab99516542f0..3af3e5152ba6bba5bf22ec8889816dff53321cdb 100644 (file)
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -23,8 +23,8 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "700 MB",
-    :cache_dir => "coss /store/squid/coss-01 10000 block-size=8192 max-size=262144 membufs=30"
+    :cache_mem => "200 MB",
+    :cache_dir => "coss /store/squid/coss-01 7500 block-size=8192 max-size=262144 membufs=30"
   },
   :sysctl => {
     :kvm => {
@@ -33,23 +33,19 @@ default_attributes(
         "kernel.sched_min_granularity_ns" => 10000000,
         "kernel.sched_wakeup_granularity_ns" => 15000000
       }
-    }
-  },
-  :sysfs => {
-    :hdd_tune => {
-      :comment => "Tune the queue for improved performance",
+    },
+    :network_conntrack_max => {
+      :comment => "Increase max number of connections tracked",
       :parameters => {
-        "block/xvda/queue/nr_requests" => "128",
-        "block/xvda/queue/scheduler" => "deadline"
+        "net.netfilter.nf_conntrack_max" => "65536"
       }
     }
   },
   :tilecache => {
     :tile_parent => "sanfrancisco.render.openstreetmap.org",
     :tile_siblings => [
-      "nadder-01.openstreetmap.org",
-      "nadder-02.openstreetmap.org",
       "stormfly-02.openstreetmap.org",
+      "ascalon.openstreetmap.org",
       "nepomuk.openstreetmap.org",
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org"