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

[chef.git] / roles / gorynych.rb

diff --git a/roles/gorynych.rb b/roles/gorynych.rb
index 101e9d083004ed7dad10902809e03bf49cc6b3ba..c57c56e0f871920edac5826f63b7cbec3ed17c38 100644 (file)
--- a/roles/gorynych.rb
+++ b/roles/gorynych.rb
@@ -2,6 +2,12 @@ name "gorynych"
 description "Master role applied to gorynych"
 
 default_attributes(
 description "Master role applied to gorynych"
 
 default_attributes(

+  :hardware => {
+    :ipmi => {
+      :excluded_sensors => [3, 4]
+    },
+    :shm_size => "20g"
+  },

   :munin => {
     :plugins => {
       :smart_sdc => {
   :munin => {
     :plugins => {
       :smart_sdc => {


@@ -18,9 +24,9 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
         :interface => "eth1",
         :role => :external,
         :family => :inet,

-        :address => "130.193.62.73",
-        :prefix => "29",
-        :gateway => "130.193.62.78"
+        :address => "5.45.248.21",
+        :prefix => "30",
+        :gateway => "5.45.248.22"

       },
       :external_ipv6 => {
         :interface => "eth1",
       },
       :external_ipv6 => {
         :interface => "eth1",


@@ -42,19 +48,25 @@ default_attributes(
     }
   },
   :squid => {
     }
   },
   :squid => {

-    :cache_mem => "5800 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :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",
+        :max_size => "32768M"
+      }
+    }

   },
   :tilecache => {
   },
   :tilecache => {

-    :tile_parent => "moscow.render.openstreetmap.org",
-    :tile_siblings => [
-      "trogdor.openstreetmap.org",
-      "fume.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "nepomuk.openstreetmap.org",
-      "ridgeback.openstreetmap.org"
-    ]
+    :tile_parent => "moscow.render.openstreetmap.org"

   }
 )
 
   }
 )