Order renderd munin graphs consistently

[chef.git] / roles / jakelong.rb

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index 640bd0dd8bdfe2e3abd4c1b818a9e854c88d8ade..0a20f3ddb2b5efef0b671ecfe22c109c565dddc4 100644 (file)
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -18,18 +18,18 @@ 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 => "700 MB",
+    :cache_mem => "400 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 => { 
+      :parameters => {
         "kernel.sched_min_granularity_ns" => 10000000,
         "kernel.sched_wakeup_granularity_ns" => 15000000
       }
@@ -39,7 +39,6 @@ default_attributes(
     :hdd_tune => {
       :comment => "Tune the queue for improved performance",
       :parameters => {
-        "block/xvda/queue/nr_requests" => "128",
         "block/xvda/queue/scheduler" => "deadline"
       }
     }
@@ -49,13 +48,16 @@ default_attributes(
     :tile_siblings => [
       "nadder-01.openstreetmap.org",
       "nadder-02.openstreetmap.org",
+      "stormfly-02.openstreetmap.org",
       "nepomuk.openstreetmap.org",
-      "tabaluga.openstreetmap.org"
+      "katie.openstreetmap.org",
+      "konqi.openstreetmap.org"
     ]
   }
 )
 
 run_list(
   "role[prgmr]",
+  "role[geodns]",
   "role[tilecache]"
 )