Convert wordpress_site to an LWRP

[chef.git] / roles / yevaud.rb

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index a63a613ad9fab702ff3ca9b7d485a969c40a3b2d..39c40136ed87c36efc27490a63caef6fda6156df 100644 (file)
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -40,59 +40,39 @@ default_attributes(
       :serial => "INTEL_SSDSA2CW600G3_CVPR111401HP600FGN",
       :attrs => {
         "queue/scheduler" => "noop",
-        "queue/nr_requests" => "512"
+        "queue/nr_requests" => "512",
+        "queue/read_ahead_kb" => "2048"
       }
     }
   },
   :munin => {
     :plugins => {
       :cpu => {
-        :system => { 
+        :system => {
           :warning => 500,
           :critical => 600
         }
       },
       :load => {
-        :load => { 
+        :load => {
           :warning => 150,
           :critical => 200
         }
-      },
-      :ipmi_fans => {
-        :contacts => "null",
-      },
-      :ipmi_temp => {
-        :contacts => "null",
-      },
-      :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,
         :family => :inet,
-        :address => "128.40.168.104"
+        :address => "128.40.45.208"
       }
     }
   },
   :postgresql => {
-    :versions => [ "9.1" ],
+    :versions => ["9.1"],
     :settings => {
       :defaults => {
         :shared_buffers => "3GB",
@@ -104,7 +84,7 @@ 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
       }
@@ -124,6 +104,7 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-internal]",
+  "role[ucl-wolfson]",
+  "role[tyan-s7010]",
   "role[tile]"
 )