Run job processors for the storage queue

[chef.git] / roles / ridgeback.rb

diff --git a/roles/ridgeback.rb b/roles/ridgeback.rb
index a680230427df53284366c62e51ef0e38fc6f3d86..5fa68580d9ef4d0533a8eb9eea8f6570797cff2f 100644 (file)
--- a/roles/ridgeback.rb
+++ b/roles/ridgeback.rb
@@ -9,6 +9,16 @@ default_attributes(
         :Fan5 => { :graph => "no", :warning => "0:" },
         :Fan6 => { :graph => "no", :warning => "0:" },
         :Fan7CPU1 => { :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
+        }

       }
     }
   },
       }
     }
   },


@@ -42,32 +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",
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org",
       "trogdor.openstreetmap.org",
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org",

-      "nepomuk.openstreetmap.org",

       "gorynych.openstreetmap.org",
       "simurgh.openstreetmap.org"
     ]
       "gorynych.openstreetmap.org",
       "simurgh.openstreetmap.org"
     ]

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

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

+  "role[geodns]",

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