Use passenger-config to restart passenger apps

[chef.git] / roles / yevaud.rb

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index 7ff33d71061f92e4cc891166e3df994c740070c8..6d33455e4049bec525730c825b3c44e3674fc806 100644 (file)
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -48,43 +48,21 @@ default_attributes(
   :munin => {
     :plugins => {
       :cpu => {
-        :system => { 
+        :system => {
           :warning => 500,
           :critical => 600
         }
       },
       :load => {
-        :load => { 
-          :warning => 150,
-          :critical => 200
+        :load => {
+          :warning => 250,
+          :critical => 300
         }
-      },
-      :ipmi_fans => {
-        :contacts => "null",
-      },
-      :ipmi_temp => {
-        :CPU0belowTmax => { :critical => "10:" },
-        :CPU1belowTmax => { :critical => "10:" }
-      },
-      :sensors_fan => {
-        :contacts => "null"
-      },
-      :sensors_temp => {
-        :contacts => "null"
-      },
-      :sensors_volt => {
-        :contacts => "null"
       }
     }
   },
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
-        :interface => "eth0",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.0.15"
-      },
       :external_ipv4 => {
         :interface => "eth1",
         :role => :external,
@@ -94,7 +72,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => [ "9.1" ],
+    :versions => ["9.1"],
     :settings => {
       :defaults => {
         :shared_buffers => "3GB",
@@ -106,10 +84,17 @@ default_attributes(
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
-      :parameters => { 
+      :parameters => {
         "kernel.shmmax" => 4 * 1024 * 1024 * 1024,
         "kernel.shmall" => 4 * 1024 * 1024 * 1024 / 4096
       }
+    },
+    :cpu_tune => {
+      :comment => "Tune kern sched migration cost",
+      :parameters => {
+        "kernel.sched_autogroup_enabled" => 0,
+        "kernel.sched_migration_cost_ns" => 25000000
+      }
     }
   },
   :tile => {
@@ -127,5 +112,6 @@ default_attributes(
 
 run_list(
   "role[ucl-wolfson]",
+  "role[tyan-s7010]",
   "role[tile]"
 )