Use the right PreStart URL for the https virtual server

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

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index b10eff2dbddbc9796451ff81bbd3def45846fd8e..dd2d8015727afc1ccc716fb234eace7cbae45065 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -22,7 +22,14 @@ when "GenuineIntel"
   package "intel-microcode"
 end
 
-if node[:dmi] and node[:dmi][:system]
+case node[:cpu][:"0"][:vendor_id]
+when "AuthenticAMD"
+  if node[:lsb][:release].to_f >= 14.04
+    package "amd64-microcode"
+  end
+end
+
+if node[:dmi] && node[:dmi][:system]
   case node[:dmi][:system][:manufacturer]
   when "empty"
     manufacturer = node[:dmi][:base_board][:manufacturer]
@@ -50,7 +57,7 @@ when "TYAN Computer Corporation"
   speed = "115200"
 when "Supermicro"
   case product
-  when "H8DGU", "X9SCD", "X7DBU", "X7DW3", "X9DR7/E-(J)LN4F", "X9DR3-F"
+  when "H8DGU", "X9SCD", "X7DBU", "X7DW3", "X9DR7/E-(J)LN4F", "X9DR3-F", "X9DRW"
     unit = "1"
     speed = "115200"
   else
@@ -62,7 +69,7 @@ when "IBM"
   speed = "115200"
 end
 
-if manufacturer == "HP" and node[:lsb][:release].to_f > 11.10
+if manufacturer == "HP" && node[:lsb][:release].to_f > 11.10
   include_recipe "git"
 
   git "/opt/hp/hp-legacy" do
@@ -104,7 +111,7 @@ unless unit.nil?
 
   service "ttyS#{unit}" do
     provider Chef::Provider::Service::Upstart
-    action [ :enable, :start ]
+    action [:enable, :start]
     supports :status => true, :restart => true, :reload => false
     subscribes :restart, "template[/etc/init/ttyS#{unit}.conf]"
   end
@@ -141,10 +148,32 @@ template "/etc/initramfs-tools/conf.d/mdadm" do
   notifies :run, "execute[update-initramfs]"
 end
 
+package "haveged"
+service "haveged" do
+  action [:enable, :start]
+end
+
 if node[:kernel][:modules].include?("ipmi_si")
   package "ipmitool"
 end
 
+if node[:lsb][:release].to_f >= 12.10
+  package "irqbalance"
+
+  template "/etc/default/irqbalance" do
+    source "irqbalance.erb"
+    owner "root"
+    group "root"
+    mode 0644
+  end
+
+  service "irqbalance" do
+    action [:start, :enable]
+    supports :status => false, :restart => true, :reload => false
+    subscribes :restart, "template[/etc/default/irqbalance]"
+  end
+end
+
 tools_packages = []
 status_packages = {}
 
@@ -158,7 +187,7 @@ node[:kernel][:modules].each_key do |modname|
     status_packages["cciss-vol-status"] ||= []
   when "mptsas"
     tools_packages << "lsiutil"
-    #status_packages["mpt-status"] ||= []
+    # status_packages["mpt-status"] ||= []
   when "mpt2sas"
     tools_packages << "sas2ircu"
     status_packages["sas2ircu-status"] ||= []
@@ -174,19 +203,19 @@ node[:kernel][:modules].each_key do |modname|
   end
 end
 
-node[:block_device].each do |name,attributes|
-  if attributes[:vendor] == "HP" and attributes[:model] == "LOGICAL VOLUME"
-    if name =~ /^cciss!(c[0-9]+)d[0-9]+$/
-      status_packages["cciss-vol-status"] |= [ "cciss/#{$1}d0" ]
-    else
-      Dir.glob("/sys/block/#{name}/device/scsi_generic/*").each do |sg|
-        status_packages["cciss-vol-status"] |= [ File.basename(sg) ]
-      end
+node[:block_device].each do |name, attributes|
+  next unless attributes[:vendor] == "HP" && attributes[:model] == "LOGICAL VOLUME"
+
+  if name =~ /^cciss!(c[0-9]+)d[0-9]+$/
+    status_packages["cciss-vol-status"] |= ["cciss/#{Regexp.last_match[1]}d0"]
+  else
+    Dir.glob("/sys/block/#{name}/device/scsi_generic/*").each do |sg|
+      status_packages["cciss-vol-status"] |= [File.basename(sg)]
     end
   end
 end
 
-["hpacucli", "lsiutil", "sas2ircu", "megactl", "megacli", "arcconf"].each do |tools_package|
+%w(hpacucli lsiutil sas2ircu megactl megacli arcconf).each do |tools_package|
   if tools_packages.include?(tools_package)
     package tools_package
   else
@@ -209,7 +238,7 @@ end
     end
 
     service "#{status_package}d" do
-      action [ :start, :enable ]
+      action [:start, :enable]
       supports :status => false, :restart => true, :reload => false
       subscribes :restart, "template[/etc/default/#{status_package}d]"
     end
@@ -223,3 +252,79 @@ end
     end
   end
 end
+
+if File.exist?("/etc/mdadm/mdadm.conf")
+  mdadm_conf = edit_file "/etc/mdadm/mdadm.conf" do |line|
+    line.gsub!(/^MAILADDR .*$/, "MAILADDR admins@openstreetmap.org")
+
+    line
+  end
+
+  file "/etc/mdadm/mdadm.conf" do
+    owner "root"
+    group "root"
+    mode 0644
+    content mdadm_conf
+  end
+
+  service "mdadm" do
+    action :nothing
+    subscribes :restart, "file[/etc/mdadm/mdadm.conf]"
+  end
+end
+
+template "/etc/modules" do
+  source "modules.erb"
+  owner "root"
+  group "root"
+  mode 0644
+end
+
+if node[:lsb][:release].to_f <= 12.10
+  service "module-init-tools" do
+    provider Chef::Provider::Service::Upstart
+    action :nothing
+    subscribes :start, "template[/etc/modules]"
+  end
+else
+  service "kmod" do
+    provider Chef::Provider::Service::Upstart
+    action :nothing
+    subscribes :start, "template[/etc/modules]"
+  end
+end
+
+if node[:hardware][:watchdog]
+  package "watchdog"
+
+  template "/etc/default/watchdog" do
+    source "watchdog.erb"
+    owner "root"
+    group "root"
+    mode 0644
+    variables :module => node[:hardware][:watchdog]
+  end
+
+  service "watchdog" do
+    action [:enable, :start]
+  end
+end
+
+unless Dir.glob("/sys/class/hwmon/hwmon*").empty?
+  package "lm-sensors"
+
+  execute "/etc/sensors.d/chef.conf" do
+    action :nothing
+    command "/usr/bin/sensors -s"
+    user "root"
+    group "root"
+  end
+
+  template "/etc/sensors.d/chef.conf" do
+    source "sensors.conf.erb"
+    owner "root"
+    group "root"
+    mode 0644
+    notifies :run, "execute[/etc/sensors.d/chef.conf]"
+  end
+end