Use new style extension initialisation for osmtaginfo

[chef.git] / roles / gorynych.rb

diff --git a/roles/gorynych.rb b/roles/gorynych.rb
index 101e9d083004ed7dad10902809e03bf49cc6b3ba..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(
 description "Master role applied to gorynych"
 
 default_attributes(

+  :hardware => {
+    :ipmi => {
+      :excluded_sensors => [3, 4]
+    }
+  },

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


@@ -18,9 +23,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",


@@ -40,25 +45,9 @@ default_attributes(
         "block/md0/md/sync_speed_max" => "100000"
       }
     }
         "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",
-      "fume.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "nepomuk.openstreetmap.org",
-      "ridgeback.openstreetmap.org"
-    ]

   }
 )
 
 run_list(
   }
 )
 
 run_list(

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

 )
 )