Reconfigure ascalon for move to Wolfson House

[chef.git] / roles / orm.rb

diff --git a/roles/orm.rb b/roles/orm.rb
index b5fb0f3b1f10db8dd7a27aed8b7b391fd4070f50..1b49d0cfecd47089af646294ec211a2105238b4b 100644 (file)
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -3,54 +3,26 @@ description "Master role applied to orm"
 
 default_attributes(
   :devices => {
 
 default_attributes(
   :devices => {

-    :ssdvol1tune => {
+    :ssd_samsung => {

       :comment => "Tune scheduler for SSD",
       :type => "block",
       :bus => "ata",
       :comment => "Tune scheduler for SSD",
       :type => "block",
       :bus => "ata",

-      :serial => "SATA_Samsung_SSD_840S12SNEAD411116P",
+      :serial => "Samsung_SSD_840_PRO_Series_*",

       :attrs => {
         "queue/scheduler" => "noop",
       :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 => "SATA_Samsung_SSD_840S12SNEAD411110E",
-      :attrs => {
-        "queue/scheduler" => "noop",
-        "queue/nr_requests" => "256"
-      }
-    },
-    :arecavol1tune => {
+    :arecavoltune => {

       :comment => "Tune scheduler for Areca",
       :type => "block",
       :bus => "scsi",
       :comment => "Tune scheduler for Areca",
       :type => "block",
       :bus => "scsi",

-      :serial => "2001b4d2049002450",
+      :serial => "2001b4d20*",

       :attrs => {
         "queue/scheduler" => "deadline",
       :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 => "2001b4d2031365276",
-      :attrs => {
-        "queue/scheduler" => "deadline",
-        "queue/nr_requests" => "512"
+        "queue/nr_requests" => "512",
+        "queue/read_ahead_kb" => "2048"

       }
     }
   },
       }
     }
   },


@@ -74,6 +46,9 @@ default_attributes(
       },
       :sensors_volt => {
         :contacts => "null",
       },
       :sensors_volt => {
         :contacts => "null",

+        :volt6 => {
+          :warning => "2.992:3.536"
+        }

       }
     }
   },
       }
     }
   },


@@ -113,8 +88,15 @@ default_attributes(
     }
   },
   :tile => {
     }
   },
   :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 }
+        ]
+      }
+    }

   }
 )
 
   }
 )