move nominatim traffic back to poldi/pummelzacken

[chef.git] / roles / fume.rb

diff --git a/roles/fume.rb b/roles/fume.rb
index ac5b7ecd4a9f394fd1742b2148eee88191906ece..88b23ab70afcc3b6b707ddd5c7c331ba6a56b79f 100644 (file)
--- a/roles/fume.rb
+++ b/roles/fume.rb
@@ -2,6 +2,13 @@ name "fume"
 description "Master role applied to fume"
 
 default_attributes(
+  :munin => {
+    :plugins => {
+      :df => {
+        :_dev_cciss_c0d1p1 => { :warning => ":95" }
+      }
+    }
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -31,14 +38,26 @@ default_attributes(
       :parameters => {
         "block/cciss\!c0d0/queue/nr_requests" => "512",
         "block/cciss\!c0d1/queue/nr_requests" => "512",
-       "block/cciss\!c0d0/queue/scheduler" => "noop",
-       "block/cciss\!c0d1/queue/scheduler" => "noop"
+        "block/cciss\!c0d0/queue/scheduler" => "noop",
+        "block/cciss\!c0d1/queue/scheduler" => "noop"
       }
     }
+  },
+  :tilecache => {
+    :tile_parent => "sjobo.render.openstreetmap.org",
+    :tile_siblings => [
+      "trogdor.openstreetmap.org",
+      "ridgeback.openstreetmap.org",
+      "katie.openstreetmap.org",
+      "konqi.openstreetmap.org",
+      "gorynych.openstreetmap.org",
+      "nepomuk.openstreetmap.org"
+    ]
   }
 )
 
 run_list(
   "role[teleservice]",
+  "role[geodns]",
   "role[tilecache]"
 )