X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8e3e7264d0bba3adc61ca88c33d636b0a7605da7..6694697e2851ac362546d34cf12f146633be3782:/roles/jakelong.rb

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index 5338778e0..3af3e5152 100644
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -18,35 +18,43 @@ default_attributes(
         :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 => {
-    :cache_mem => "650 MB",
-    :cache_dir => "coss /store/squid/coss-01 15000 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"
   },
-  :sysfs => {
-    :hdd_tune => {
-      :comment => "Tune the queue for improved performance",
+  :sysctl => {
+    :kvm => {
+      :comment => "Tuning for KVM guest",
       :parameters => {
-        "block/xvda/queue/nr_requests" => "64",
-        "block/xvda/queue/scheduler" => "deadline"
+        "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 => [
-      "nadder-01.openstreetmap.org",
-      "nadder-02.openstreetmap.org",
+      "stormfly-02.openstreetmap.org",
+      "ascalon.openstreetmap.org",
       "nepomuk.openstreetmap.org",
-      "tabaluga.openstreetmap.org"
+      "katie.openstreetmap.org",
+      "konqi.openstreetmap.org"
     ]
   }
 )
 
 run_list(
   "role[prgmr]",
+  "role[geodns]",
   "role[tilecache]"
 )