Correct paths to tftp root directory

[chef.git] / roles / orm.rb

diff --git a/roles/orm.rb b/roles/orm.rb
index e8caaf82e9a17f6351932df07cf90409794c2771..bf2a5ceeaca7bc7aac02b768358562cf3d83c532 100644 (file)
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -3,17 +3,6 @@ description "Master role applied to orm"
 
 default_attributes(
   :devices => {
 
 default_attributes(
   :devices => {

-    :ssd_samsung => {
-      :comment => "Tune scheduler for SSD",
-      :type => "block",
-      :bus => "ata",
-      :serial => "Samsung_SSD_840_PRO_Series_*",
-      :attrs => {
-        "queue/scheduler" => "noop",
-        "queue/nr_requests" => "256",
-        "queue/read_ahead_kb" => "2048"
-      }
-    },

     :arecavoltune => {
       :comment => "Tune scheduler for Areca",
       :type => "block",
     :arecavoltune => {
       :comment => "Tune scheduler for Areca",
       :type => "block",


@@ -62,13 +51,7 @@ default_attributes(
   }
 )
 
   }
 )
 

-override_attributes(
-  :networking => {
-    :nameservers => ["8.8.8.8", "8.8.4.4"]
-  }
-)
-

 run_list(
 run_list(

-  "role[equinix]",
+  "role[equinix-ams]",

   "role[tyan-s7010]"
 )
   "role[tyan-s7010]"
 )