Reduce nf_conntrack_max on jakelong

[chef.git] / roles / jakelong.rb

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index 0a20f3ddb2b5efef0b671ecfe22c109c565dddc4..160f4d594f99e82080030a9e49014e09bf1c3701 100644 (file)
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -24,7 +24,7 @@ default_attributes(
   },
   :squid => {
     :cache_mem => "400 MB",
   },
   :squid => {
     :cache_mem => "400 MB",

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

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


@@ -33,22 +33,19 @@ default_attributes(
         "kernel.sched_min_granularity_ns" => 10000000,
         "kernel.sched_wakeup_granularity_ns" => 15000000
       }
         "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 => {
       :parameters => {

-        "block/xvda/queue/scheduler" => "deadline"
+        "net.netfilter.nf_conntrack_max" => "65536"

       }
     }
   },
   :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"