KVM guests: set block queue depth back to default

[chef.git] / roles / nadder-02.rb

diff --git a/roles/nadder-02.rb b/roles/nadder-02.rb
index 22541a067de372819ff54fd21fe6b33d02008c68..1a84ee8450b8fbbd3ff208e01ab438edd9a2eb77 100644 (file)
--- a/roles/nadder-02.rb
+++ b/roles/nadder-02.rb
@@ -14,20 +14,38 @@ default_attributes(
       }
     }
   },
+  :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/vda/queue/nr_requests" => "512",
-        "block/vdb/queue/nr_requests" => "512",
+        "block/vda/queue/nr_requests" => "128",
+        "block/vdb/queue/nr_requests" => "128",
         "block/vda/queue/scheduler" => "deadline",
         "block/vdb/queue/scheduler" => "deadline"
       }
     }
   },
   :squid => {
-    :cache_mem => "1500 MB",
+    :cache_mem => "6500 MB",
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+  },
+  :tilecache => {
+    :tile_parent => "provo.render.openstreetmap.org",
+    :tile_siblings => [
+      "nadder-01.openstreetmap.org",
+      "jakelong.openstreetmap.org",
+      "nepomuk.openstreetmap.org",
+      "lurien.openstreetmap.org"
+    ]
   }
 )