X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1cb9a64073aa6cffccf01930672295a0d26e229d..5fa8371c3f85518e08a49bb6719002f213fd41fb:/roles/yevaud.rb

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index 0489c69d2..299005da2 100644
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -2,6 +2,49 @@ name "yevaud"
 description "Master role applied to yevaud"
 
 default_attributes(
+  :devices => {
+    :osdisktune1 => {
+      :comment => "Tune os disk",
+      :type => "block",
+      :bus => "scsi",
+      :serial => "20004d927fffff800",
+      :attrs => {
+        "queue/scheduler" => "deadline",
+        "queue/nr_requests" => "512"
+      }
+    },
+    :disktune2 => {
+      :comment => "Tune database array",
+      :type => "block",
+      :bus => "scsi",
+      :serial => "20004d927fffff802",
+      :attrs => {
+        "queue/scheduler" => "deadline",
+        "queue/nr_requests" => "512"
+      }
+    },
+    :disktune3 => {
+      :comment => "Tune os disk",
+      :type => "block",
+      :bus => "scsi",
+      :serial => "20004d927fffff803",
+      :attrs => {
+        "queue/scheduler" => "deadline",
+        "queue/nr_requests" => "512"
+      }
+    },
+    :ssdtune1 => {
+      :comment => "Tune ssd disk",
+      :type => "block",
+      :bus => "ata",
+      :serial => "INTEL_SSDSA2CW600G3_CVPR111401HP600FGN",
+      :attrs => {
+        "queue/scheduler" => "noop",
+        "queue/nr_requests" => "512",
+        "queue/read_ahead_kb" => "2048"
+      }
+    }
+  },
   :munin => {
     :plugins => {
       :cpu => {
@@ -17,10 +60,18 @@ default_attributes(
         }
       },
       :ipmi_fans => {
-        :contacts => "null",
+        :Sys3Front1 => { :graph => "no" },
+        :Sys4Front2 => { :graph => "no" },
+        :Sys5Rear1 => { :graph => "no" },
+        :Sys6 => { :graph => "no" },
+        :Sys7 => { :graph => "no" },
+        :Sys8 => { :graph => "no" },
+        :Sys9 => { :graph => "no" },
+        :Sys10 => { :graph => "no" }
       },
       :ipmi_temp => {
-        :contacts => "null",
+        :CPU0belowTmax => { :critical => "10:" },
+        :CPU1belowTmax => { :critical => "10:" }
       },
       :sensors_fan => {
         :contacts => "null"
@@ -45,7 +96,7 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.104"
+        :address => "128.40.45.208"
       }
     }
   },
@@ -69,12 +120,19 @@ default_attributes(
     }
   },
   :tile => {
-    :tile_directory => "/store/tiles",
-    :node_file => "/store/database/nodes"
+    :node_file => "/store/database/nodes",
+    :styles => {
+      :default => {
+        :tile_directories => [
+          { :name => "/store/tiles/default-low", :min_zoom => 0, :max_zoom => 16 },
+          { :name => "/store/tiles/default-high", :min_zoom => 17, :max_zoom => 19 }
+        ]
+      }
+    }
   }
 )
 
 run_list(
-  "role[ucl-internal]",
+  "role[ucl-wolfson]",
   "role[tile]"
 )