From 6f26052c85ad56d492fd52d8d9ef1096a9147974 Mon Sep 17 00:00:00 2001
From: Grant Slater <git@firefishy.com>
Date: Fri, 21 Feb 2014 15:52:01 +0000
Subject: [PATCH] orm: add readahead tuning

---
 roles/orm.rb | 44 ++++++++------------------------------------
 1 file changed, 8 insertions(+), 36 deletions(-)

diff --git a/roles/orm.rb b/roles/orm.rb
index 2a834b101..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 => {
-      :comment => "Tune scheduler for Areca",
-      :type => "block",
-      :bus => "scsi",
-      :serial => "2001b4d2049002450",
-      :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 => {
+    :arecavoltune => {
       :comment => "Tune scheduler for Areca",
       :type => "block",
       :bus => "scsi",
-      :serial => "2001b4d2060246956",
+      :serial => "2001b4d20*",
       :attrs => {
         "queue/scheduler" => "deadline",
-        "queue/nr_requests" => "512"
+        "queue/nr_requests" => "512",
+        "queue/read_ahead_kb" => "2048"
       }
     }
   },
-- 
2.43.2