Bump cookstyle from 7.30.4 to 7.31.1

[chef.git] / roles / ridgeback.rb

diff --git a/roles/ridgeback.rb b/roles/ridgeback.rb
index a19f77c07baed05b419c38ebd9c2134ada73b032..75ddb901cd23d30ba118597751707ad05c9ac0ff 100644 (file)
--- a/roles/ridgeback.rb
+++ b/roles/ridgeback.rb
@@ -2,6 +2,11 @@ name "ridgeback"
 description "Master role applied to ridgeback"
 
 default_attributes(
 description "Master role applied to ridgeback"
 
 default_attributes(

+  :hardware => {
+    :ipmi => {
+      :excluded_sensors => [19, 20, 21, 22]
+    }
+  },

   :munin => {
     :plugins => {
       :ipmi_fans => {
   :munin => {
     :plugins => {
       :ipmi_fans => {


@@ -44,26 +49,10 @@ default_attributes(
         "block/md1/md/sync_speed_max" => "100000"
       }
     }
         "block/md1/md/sync_speed_max" => "100000"
       }
     }

-  },
-  :squid => {
-    :cache_mem => "5500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "oslo.render.openstreetmap.org",
-    :tile_siblings => [
-      "trogdor.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "nepomuk.openstreetmap.org",
-      "gorynych.openstreetmap.org",
-      "simurgh.openstreetmap.org"
-    ]

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

-  "role[geodns]",
-  "role[tilecache]"
+  "role[geodns]"

 )
 )