Drop support for old UCL locations

[chef.git] / roles / ramoth.rb

diff --git a/roles/ramoth.rb b/roles/ramoth.rb
index 17553f5d310d57caa5c8abefe556e80572c4fb35..32a0499c9f7d44b970620192d5bc1a9e7f19ce9b 100644 (file)
--- a/roles/ramoth.rb
+++ b/roles/ramoth.rb
@@ -10,7 +10,7 @@ default_attributes(
       :comment => "RAID array mounted on /store/postgresql/openstreetmap",
       :type => "block",
       :bus => "scsi",
-      :serial => "3600605b0039483a017092ecbe862082a",
+      :serial => "3600605b00599aa401c02b4f53bf5c805",
       :attrs => {
         "queue/scheduler" => "deadline",
         "queue/nr_requests" => "975"
@@ -27,6 +27,19 @@ default_attributes(
       }
     }
   },
+  :hardware => {
+    :watchdog => "w83627hf_wdt"
+  },
+  :munin => {
+    :plugins => {
+      :smart_sg0_33 => {
+        :smartctl_exit_status => { :warning => ":8" }
+      },
+      :smart_sg0_34 => {
+        :smartctl_exit_status => { :warning => ":8" }
+      }
+    }
+  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
@@ -51,16 +64,15 @@ default_attributes(
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
-      :parameters => { 
+      :parameters => {
         "kernel.shmmax" => 66 * 1024 * 1024 * 1024,
         "kernel.shmall" => 66 * 1024 * 1024 * 1024 / 4096
       }
     }
   }
-);
+)
 
 run_list(
   "role[ic]",
-  "role[db-master]",
-  "role[db-backup]"
+  "role[db-slave]"
 )