Add support for upgrading the chef server

[chef.git] / roles / poldi.rb

diff --git a/roles/poldi.rb b/roles/poldi.rb
index 484e27d945e7fd5962c3d1a9257c39a5045e26e3..fde01429a6b8808e79aa576dcb09edfdeaea32e1 100644 (file)
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -3,31 +3,34 @@ description "Master role applied to poldi"
 
 default_attributes(
   :devices => {
-    :ubuntu => {
-      :comment => "RAID array backing the ubuntu volume group",
+    :areca_ld_tune => {
+      :comment => "RAID arrays on areca",
       :type => "block",
       :bus => "scsi",
-      :serial => "20004d927fffff800",
+      :serial => "20004d927fffff*",
       :attrs => {
-        "queue/scheduler" => "deadline"
+        "queue/scheduler" => "deadline",
+        "queue/read_ahead_kb" => "2048"
       }
     },
-    :nominatim => {
-      :comment => "RAID array backing the nominatim volume group",
+    :ssd_samsung_tune => {
+      :comment => "Tune Samsung SSD",
       :type => "block",
-      :bus => "scsi",
-      :serial => "20004d927fffff801",
+      :bus => "ata",
+      :serial => "Samsung_SSD_840_PRO_Series_*",
       :attrs => {
-        "queue/scheduler" => "deadline"
+        "queue/scheduler" => "noop",
+        "queue/nr_requests" => "256",
+        "queue/read_ahead_kb" => "2048"
       }
-    },
-    :nominatim2 => {
-      :comment => "RAID array backing the nominatim2 volume group",
-      :type => "block",
-      :bus => "scsi",
-      :serial => "20004d927fffff802",
-      :attrs => {
-        "queue/scheduler" => "deadline"
+    }
+  },
+  :sysfs => {
+    :md_tune => {
+      :comment => "Tune the md sync performance so as not to kill system performance",
+      :parameters => {
+        "block/md0/md/sync_speed_min" => "100",
+        "block/md0/md/sync_speed_max" => "100000"
       }
     }
   },
@@ -50,13 +53,37 @@ default_attributes(
   :postgresql => {
     :settings => {
       :defaults => {
-        :shared_buffers => "12GB",
+        :shared_buffers => "24GB",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :effective_cache_size => "48GB"
       }
     }
+  },
+  :nominatim => {
+    :fpm_pools => {
+        :www => {
+            :pm => "dynamic",
+            :max_children => "70"
+        },
+        :bulk => {
+            :pm => "static",
+            :max_children => "10"
+        }
+    }
+  },
+  :munin => {
+    :plugins => {
+      :sensors_volt => {
+        :volt6 => {
+          :warning => "2.992:3.536"
+        },
+        :volt10 => {
+          :warning => "2.71:3.29"
+        }
+      }
+    }
   }
 )