Merge remote-tracking branch 'github/pull/474'

[chef.git] / roles / gorynych.rb

diff --git a/roles/gorynych.rb b/roles/gorynych.rb
index 1d2343350abac05cef47ee3b48b13a1a3ab988cd..704f9940fef05e4ea3c9d30b1d986f0d043e167a 100644 (file)
--- a/roles/gorynych.rb
+++ b/roles/gorynych.rb
@@ -2,6 +2,11 @@ name "gorynych"
 description "Master role applied to gorynych"
 
 default_attributes(
+  :hardware => {
+    :ipmi => {
+      :excluded_sensors => [3, 4]
+    }
+  },
   :munin => {
     :plugins => {
       :smart_sdc => {
@@ -40,24 +45,9 @@ default_attributes(
         "block/md0/md/sync_speed_max" => "100000"
       }
     }
-  },
-  :squid => {
-    :cache_mem => "5800 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "moscow.render.openstreetmap.org",
-    :tile_siblings => [
-      "trogdor.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "nepomuk.openstreetmap.org",
-      "ridgeback.openstreetmap.org"
-    ]
   }
 )
 
 run_list(
-  "role[yandex]",
-  "role[tilecache]"
+  "role[yandex]"
 )