X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a7d96c8358a00088b485fadb5966eb4b231d2ff1..fa4f76710511f84d19bb311a833dbb10c928d94f:/roles/yevaud.rb

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index 8432757b1..2c7339539 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 => {
@@ -45,7 +88,17 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.104"
+        :address => "128.40.45.208"
+      }
+    }
+  },
+  :postgresql => {
+    :versions => [ "9.1" ],
+    :settings => {
+      :defaults => {
+        :shared_buffers => "3GB",
+        :maintenance_work_mem => "7144MB",
+        :effective_cache_size => "8GB"
       }
     }
   },
@@ -53,13 +106,25 @@ default_attributes(
     :postgres => {
       :comment => "Increase shared memory for postgres",
       :parameters => { 
-        "kernel.shmmax" => 4 * 1024 * 1024 * 1024
+        "kernel.shmmax" => 4 * 1024 * 1024 * 1024,
+        "kernel.shmall" => 4 * 1024 * 1024 * 1024 / 4096
+      }
+    }
+  },
+  :tile => {
+    :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[tile-old]"
+  "role[ucl-wolfson]",
+  "role[tile]"
 )