Reduce nf_conntrack_max on jakelong

[chef.git] / roles / jakelong.rb

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index 41b409f5d76e25e6bf64f449f16be0ced178ab3e..160f4d594f99e82080030a9e49014e09bf1c3701 100644 (file)
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -18,26 +18,43 @@ default_attributes(
         :family => :inet6,
         :address => "2001:470:1:41:a800:ff:fe3e:cdca",
         :prefix => "64",
         :family => :inet6,
         :address => "2001:470:1:41:a800:ff:fe3e:cdca",
         :prefix => "64",

-        :gateway => "fe80::21b:21ff:fead:e886"
+        :gateway => "fe80::260:ddff:fe46:623d"

       }
     }
   },
   :squid => {
       }
     }
   },
   :squid => {

-    :cache_mem => "650 MB",
-    :cache_dir => "coss /store/squid/coss-01 15000 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 => {
+      :comment => "Tuning for KVM guest",
+      :parameters => {
+        "kernel.sched_min_granularity_ns" => 10000000,
+        "kernel.sched_wakeup_granularity_ns" => 15000000
+      }
+    },
+    :network_conntrack_max => {
+      :comment => "Increase max number of connections tracked",
+      :parameters => {
+        "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",
+      "ascalon.openstreetmap.org",

       "nepomuk.openstreetmap.org",
       "nepomuk.openstreetmap.org",

-      "tabaluga.openstreetmap.org"
+      "katie.openstreetmap.org",
+      "konqi.openstreetmap.org"

     ]
   }
 )
 
 run_list(
   "role[prgmr]",
     ]
   }
 )
 
 run_list(
   "role[prgmr]",

+  "role[geodns]",

   "role[tilecache]"
 )
   "role[tilecache]"
 )