Merge pull request #360 from Firefishy/torrent-rss

[chef.git] / roles / katla.rb

diff --git a/roles/katla.rb b/roles/katla.rb
index 4be8aae1d48439d7b392f8bb8c000413a9837c12..6143cf533a3e1565a6e25b779d8a432e22ec89c9 100644 (file)
--- a/roles/katla.rb
+++ b/roles/katla.rb
@@ -2,9 +2,6 @@ name "katla"
 description "Master role applied to katla"
 
 default_attributes(
-  :db => {
-    :cluster => "9.1/main"
-  },
   :devices => {
     :store_slow => {
       :comment => "RAID array mounted on /store/arrays/slow",
@@ -13,7 +10,8 @@ default_attributes(
       :serial => "3600605b005a0609019290f178be8de77",
       :attrs => {
         "queue/scheduler" => "deadline",
-        "queue/nr_requests" => "975"
+        "queue/nr_requests" => "975",
+        "queue/rq_affinity" => "2"
       }
     },
     :store_fast => {
@@ -23,18 +21,39 @@ default_attributes(
       :serial => "3600605b005a0726019d062ae23b426fd",
       :attrs => {
         "queue/scheduler" => "deadline",
-        "queue/nr_requests" => "975"
+        "queue/nr_requests" => "975",
+        "queue/rq_affinity" => "2"
+      }
+    },
+    :store_ssd_1 => {
+      :comment => "First disk of RAID array mounted on /store/arrays/ssd",
+      :type => "block",
+      :bus => "ata",
+      :serial => "INTEL_SSDSC2BA400G3_BTTV3141041E400HGN",
+      :attrs => {
+        "queue/scheduler" => "noop"
+      }
+    },
+    :store_ssd_2 => {
+      :comment => "Second disk of RAID array mounted on /store/arrays/ssd",
+      :type => "block",
+      :bus => "ata",
+      :serial => "INTEL_SSDSC2BA400G3_BTTV3141044Q400HGN",
+      :attrs => {
+        "queue/scheduler" => "noop"
       }
     }
   },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth0",
+        :interface => "bond0",
         :role => :internal,
         :family => :inet,
-        :address => "146.179.159.173",
-        :hwaddress => "00:25:90:94:91:00"
+        :address => "10.0.32.40",
+        :bond => {
+          :slaves => %w[eth0 eth1]
+        }
       }
     }
   },
@@ -57,9 +76,9 @@ default_attributes(
       }
     }
   }
-);
+)
 
 run_list(
-  "role[ic]",
+  "role[bytemark]",
   "role[db-slave]"
 )