Start serial console on ttyS2 for OVH machines

[chef.git] / cookbooks / hardware / recipes / default.rb

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 0e335183896291649275f7ecd9a5f4dc033c82ec..f9f76cd46dc11fadc87f3e7d2fdb98d9ef22a58f 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -31,9 +31,7 @@ end
 
 case node[:cpu][:"0"][:vendor_id]
 when "AuthenticAMD"
-  if node[:lsb][:release].to_f >= 14.04
-    package "amd64-microcode"
-  end
+  package "amd64-microcode" if node[:lsb][:release].to_f >= 14.04
 end
 
 if node[:dmi] && node[:dmi][:system]
@@ -54,6 +52,8 @@ units = []
 
 if node[:roles].include?("bytemark") || node[:roles].include?("exonetric")
   units << "0"
+elsif node[:roles].include?("ovh")
+  units << "2"
 end
 
 case manufacturer
@@ -64,12 +64,13 @@ when "HP"
   package "hp-health" do
     action :install
     version "10.0.0.1.3-4."
+    options "--force-yes"
     notifies :restart, "service[hp-health]"
   end
 
   service "hp-health" do
     action [:enable, :start]
-    supports :status => true, :restart => true, :reload => true
+    supports :status => true, :restart => true
   end
 
   units << "1"
@@ -183,9 +184,7 @@ service "haveged" do
   action [:enable, :start]
 end
 
-if node[:kernel][:modules].include?("ipmi_si")
-  package "ipmitool"
-end
+package "ipmitool" if node[:kernel][:modules].include?("ipmi_si")
 
 if node[:lsb][:release].to_f >= 12.10
   package "irqbalance"