tilecache: remove overloaded peers

[chef.git] / roles / ridgeback.rb

diff --git a/roles/ridgeback.rb b/roles/ridgeback.rb
index 90f1c11bd107515788de9cc3ff2ae3d9fb8504ee..5fa68580d9ef4d0533a8eb9eea8f6570797cff2f 100644 (file)
--- a/roles/ridgeback.rb
+++ b/roles/ridgeback.rb
@@ -2,6 +2,26 @@ name "ridgeback"
 description "Master role applied to ridgeback"
 
 default_attributes(
 description "Master role applied to ridgeback"
 
 default_attributes(

+  :munin => {
+    :plugins => {
+      :ipmi_fans => {
+        :Fan4 => { :graph => "no", :warning => "0:" },
+        :Fan5 => { :graph => "no", :warning => "0:" },
+        :Fan6 => { :graph => "no", :warning => "0:" },
+        :Fan7CPU1 => { :graph => "no", :warning => "0:" }
+      },
+      :smart_sda => {
+        :smartctl_exit_status => {
+          :warning => 8
+        }
+      },
+      :smart_sdb => {
+        :smartctl_exit_status => {
+          :warning => 8
+        }
+      }
+    }
+  },

   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {


@@ -18,10 +38,10 @@ default_attributes(
     :md_tune => {
       :comment => "Tune the md sync performance so as not to kill system performance",
       :parameters => {
     :md_tune => {
       :comment => "Tune the md sync performance so as not to kill system performance",
       :parameters => {

-        "block/md0/md/sync_speed_min" => "10",
-        "block/md0/md/sync_speed_max" => "10000",
-        "block/md1/md/sync_speed_min" => "10",
-        "block/md1/md/sync_speed_max" => "10000"
+        "block/md0/md/sync_speed_min" => "1",
+        "block/md0/md/sync_speed_max" => "100000",
+        "block/md1/md/sync_speed_min" => "1",
+        "block/md1/md/sync_speed_max" => "100000"

       }
     }
   },
       }
     }
   },


@@ -32,24 +52,17 @@ default_attributes(
   :tilecache => {
     :tile_parent => "oslo.render.openstreetmap.org",
     :tile_siblings => [
   :tilecache => {
     :tile_parent => "oslo.render.openstreetmap.org",
     :tile_siblings => [

-      "fume.openstreetmap.org",

       "trogdor.openstreetmap.org",
       "trogdor.openstreetmap.org",

-      "tabaluga.openstreetmap.org",
-      "nepomuk.openstreetmap.org"
+      "katie.openstreetmap.org",
+      "konqi.openstreetmap.org",
+      "gorynych.openstreetmap.org",
+      "simurgh.openstreetmap.org"

     ]
     ]

-  },
-  :munin => {
-    :plugins => {
-      :smart_sdb => {
-        :smartctl_exit_status => {
-          :warning => 8
-        }
-      }
-    }

   }
 )
 
 run_list(
   "role[blix-no]",
   }
 )
 
 run_list(
   "role[blix-no]",

+  "role[geodns]",

   "role[tilecache]"
 )
   "role[tilecache]"
 )