Update configuration for move from Imperial to Amsterdam

[chef.git] / roles / ramoth.rb

diff --git a/roles/ramoth.rb b/roles/ramoth.rb
index f93a38d58659e5cbbe4953c3682c241e66d0bffb..77f5969768225dbdd4e5aa8fcf4d6b2249eea653 100644 (file)
--- a/roles/ramoth.rb
+++ b/roles/ramoth.rb
@@ -2,20 +2,18 @@ name "ramoth"
 description "Master role applied to ramoth"
 
 default_attributes(
-  :accounts => {
-    :users => {
-      :osmbackup => { :status => :role }
-    }
+  :apt => {
+    :sources => ["postgresql"]
   },
   :db => {
-    :cluster => "9.1/main"
+    :cluster => "9.5/main"
   },
   :devices => {
     :store_openstreetmap => {
       :comment => "RAID array mounted on /store/postgresql/openstreetmap",
       :type => "block",
       :bus => "scsi",
-      :serial => "3600605b0039483a017092ecbe862082a",
+      :serial => "3600605b00599aa401c02b4f53bf5c805",
       :attrs => {
         "queue/scheduler" => "deadline",
         "queue/nr_requests" => "975"
@@ -32,14 +30,29 @@ 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 => {
-        :interface => "eth0",
+        :interface => "bond0",
         :role => :internal,
         :family => :inet,
-        :address => "146.179.159.170",
-        :hwaddress => "00:25:90:4b:05:9a"
+        :address => "10.0.48.5",
+        :bond => {
+          :slaves => %w[eth0 eth1]
+        }
       }
     }
   },
@@ -56,16 +69,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]"
 )