Use .osc.gz for diffs that tile replication fetches

[chef.git] / roles / ramoth.rb

diff --git a/roles/ramoth.rb b/roles/ramoth.rb
index 6e1b71992b2e6e808a386185f8c0dc7053500e42..fad21355a46d4bd07e3424f9fbd58bca98d245e6 100644 (file)
--- a/roles/ramoth.rb
+++ b/roles/ramoth.rb
@@ -2,15 +2,18 @@ name "ramoth"
 description "Master role applied to ramoth"
 
 default_attributes(
 description "Master role applied to ramoth"
 
 default_attributes(

+  :apt => {
+    :sources => ["postgresql"]
+  },

   :db => {
   :db => {

-    :cluster => "9.1/main"
+    :cluster => "9.5/main"

   },
   :devices => {
     :store_openstreetmap => {
       :comment => "RAID array mounted on /store/postgresql/openstreetmap",
       :type => "block",
       :bus => "scsi",
   },
   :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"
       :attrs => {
         "queue/scheduler" => "deadline",
         "queue/nr_requests" => "975"


@@ -30,6 +33,16 @@ default_attributes(
   :hardware => {
     :watchdog => "w83627hf_wdt"
   },
   :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 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {


@@ -54,16 +67,15 @@ default_attributes(
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",

-      :parameters => { 
+      :parameters => {

         "kernel.shmmax" => 66 * 1024 * 1024 * 1024,
         "kernel.shmall" => 66 * 1024 * 1024 * 1024 / 4096
       }
     }
   }
         "kernel.shmmax" => 66 * 1024 * 1024 * 1024,
         "kernel.shmall" => 66 * 1024 * 1024 * 1024 / 4096
       }
     }
   }

-);
+)

 
 run_list(
   "role[ic]",
 
 run_list(
   "role[ic]",

-  "role[db-master]",
-  "role[db-backup]"
+  "role[db-slave]"

 )
 )