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

[chef.git] / roles / gorynych.rb

diff --git a/roles/gorynych.rb b/roles/gorynych.rb
index 8509291362d64461ba6c2facfc1ef1fd3119471c..704f9940fef05e4ea3c9d30b1d986f0d043e167a 100644 (file)
--- a/roles/gorynych.rb
+++ b/roles/gorynych.rb
@@ -3,7 +3,9 @@ description "Master role applied to gorynych"
 
 default_attributes(
   :hardware => {
-    :shm_size => "20g"
+    :ipmi => {
+      :excluded_sensors => [3, 4]
+    }
   },
   :munin => {
     :plugins => {
@@ -43,30 +45,9 @@ default_attributes(
         "block/md0/md/sync_speed_max" => "100000"
       }
     }
-  },
-  :squid => {
-    :version => 4,
-    :cache_mem => "16384 MB",
-    :cache_dir => [
-      "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
-      "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
-      "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
-      "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
-    ]
-  },
-  :nginx => {
-    :cache => {
-      :proxy => {
-        :directory => "/store/nginx-cache/proxy-cache"
-      }
-    }
-  },
-  :tilecache => {
-    :tile_parent => "moscow.render.openstreetmap.org"
   }
 )
 
 run_list(
-  "role[yandex]",
-  "role[tilecache]"
+  "role[yandex]"
 )