X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/559b624a1171efd0e59a991f0f5f4386a1c09712..5b05eceb81c5fbcbdccc48cfd9263d075a862088:/roles/orm.rb?ds=inline

diff --git a/roles/orm.rb b/roles/orm.rb
index 69e002ff5..9f2694fe6 100644
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -3,54 +3,26 @@ description "Master role applied to orm"
 
 default_attributes(
   :devices => {
-    :ssdvol1tune => {
+    :ssd_samsung => {
       :comment => "Tune scheduler for SSD",
       :type => "block",
       :bus => "ata",
-      :serial => "Samsung_SSD_840_PRO_Series_S12SNEAD411116P",
+      :serial => "Samsung_SSD_840_PRO_Series_*",
       :attrs => {
         "queue/scheduler" => "noop",
-        "queue/nr_requests" => "256"
+        "queue/nr_requests" => "256",
+        "queue/read_ahead_kb" => "2048"
       }
     },
-    :ssdvol2tune => {
-      :comment => "Tune scheduler for SSD",
-      :type => "block",
-      :bus => "ata",
-      :serial => "Samsung_SSD_840_PRO_Series_S12SNEAD411110E",
-      :attrs => {
-        "queue/scheduler" => "noop",
-        "queue/nr_requests" => "256"
-      }
-    },
-    :arecavol1tune => {
+    :arecavoltune => {
       :comment => "Tune scheduler for Areca",
       :type => "block",
       :bus => "scsi",
-      :serial => "2001b4d2049002450",
+      :serial => "2001b4d20*",
       :attrs => {
         "queue/scheduler" => "deadline",
-        "queue/nr_requests" => "512"
-      }
-    },
-    :arecavol2tune => {
-      :comment => "Tune scheduler for Areca",
-      :type => "block",
-      :bus => "scsi",
-      :serial => "2001b4d2037331399",
-      :attrs => {
-        "queue/scheduler" => "deadline",
-        "queue/nr_requests" => "512"
-      }
-    },
-    :arecavol3tune => {
-      :comment => "Tune scheduler for Areca",
-      :type => "block",
-      :bus => "scsi",
-      :serial => "2001b4d2060246956",
-      :attrs => {
-        "queue/scheduler" => "deadline",
-        "queue/nr_requests" => "512"
+        "queue/nr_requests" => "512",
+        "queue/read_ahead_kb" => "2048"
       }
     }
   },
@@ -113,8 +85,15 @@ 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 => 17 },
+          { :name => "/store/tiles/default-high", :min_zoom => 18, :max_zoom => 19 }
+        ]
+      }
+    }
   }
 )