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

[chef.git] / roles / cmok.rb

diff --git a/roles/cmok.rb b/roles/cmok.rb
index eb841fd2bb444e456c764f2ad8fed54f676caec9..5653d09c9c6e8c7f791cbd63ea6eacec6d5a4ccb 100644 (file)
--- a/roles/cmok.rb
+++ b/roles/cmok.rb
@@ -5,6 +5,13 @@ default_attributes(
   :hardware => {
     :shm_size => "6g"
   },
   :hardware => {
     :shm_size => "6g"
   },

+  :munin => {
+    :plugins => {
+      "diskstats_latency.sdd" => {
+        :avgrdwait => { :warning => "0:30" }
+      }
+    }
+  },

   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {


@@ -36,13 +43,7 @@ default_attributes(
     ]
   },
   :tilecache => {
     ]
   },
   :tilecache => {

-    :tile_parent => "minsk.render.openstreetmap.org",
-    :tile_siblings => [
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "gorynych.openstreetmap.org"
-    ]
+    :tile_parent => "minsk.render.openstreetmap.org"

   }
 )
 
   }
 )