Support nginx on 14.04 + dynamic number of worker processes based on CPUs

[chef.git] / roles / yevaud.rb

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index a63a613ad9fab702ff3ca9b7d485a969c40a3b2d..fefef1f72727a0522ede41c92018ff48aab993ce 100644 (file)
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -40,7 +40,8 @@ default_attributes(
       :serial => "INTEL_SSDSA2CW600G3_CVPR111401HP600FGN",
       :attrs => {
         "queue/scheduler" => "noop",
       :serial => "INTEL_SSDSA2CW600G3_CVPR111401HP600FGN",
       :attrs => {
         "queue/scheduler" => "noop",

-        "queue/nr_requests" => "512"
+        "queue/nr_requests" => "512",
+        "queue/read_ahead_kb" => "2048"

       }
     }
   },
       }
     }
   },


@@ -57,37 +58,16 @@ default_attributes(
           :warning => 150,
           :critical => 200
         }
           :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 => {
       }
     }
   },
   :networking => {
     :interfaces => {

-      :internal_ipv4 => {
-        :interface => "eth0",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.0.15"
-      },

       :external_ipv4 => {
         :interface => "eth1",
         :role => :external,
         :family => :inet,
       :external_ipv4 => {
         :interface => "eth1",
         :role => :external,
         :family => :inet,

-        :address => "128.40.168.104"
+        :address => "128.40.45.208"

       }
     }
   },
       }
     }
   },


@@ -124,6 +104,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-internal]",
+  "role[ucl-wolfson]",
+  "role[tyan-s7010]",

   "role[tile]"
 )
   "role[tile]"
 )