Revert to using project-osrm.org for OSRM routing

[chef.git] / roles / jakelong.rb

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index 44878a01e452cb04f24bf496676baf841680ad8e..3e7501c8eb1baf6a95bea073cc5623fbbc8b6b71 100644 (file)
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -23,19 +23,42 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "650 MB",
-    :cache_dir => "coss /store/squid/coss-01 15000 block-size=8192 max-size=262144 membufs=30"
+    :cache_mem => "700 MB",
+    :cache_dir => "coss /store/squid/coss-01 10000 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
+      }
+    }
+  },
+  :sysfs => {
+    :hdd_tune => {
+      :comment => "Tune the queue for improved performance",
+      :parameters => {
+        "block/xvda/queue/nr_requests" => "128",
+        "block/xvda/queue/scheduler" => "deadline"
+      }
+    }
   },
   :tilecache => {
     :tile_parent => "sanfrancisco.render.openstreetmap.org",
     :tile_siblings => [
       "nadder-01.openstreetmap.org",
-      "nadder-02.openstreetmap.org"
+      "nadder-02.openstreetmap.org",
+      "stormfly-02.openstreetmap.org",
+      "nepomuk.openstreetmap.org",
+      "katie.openstreetmap.org",
+      "konqi.openstreetmap.org"
     ]
   }
 )
 
 run_list(
   "role[prgmr]",
+  "role[geodns]",
   "role[tilecache]"
 )