X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/4f2ccd7619328a448bf3141ab234e0e95c79c478..f6b63c0bdcfde35f28573ea4a3444daff2c1fe80:/cookbooks/hardware/recipes/default.rb

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 5183978ff..5cbb13eb0 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -50,78 +50,56 @@ else
   product = "Unknown"
 end
 
+units = []
+
+if node[:roles].include?("bytemark") || node[:roles].include?("exonetric")
+  units << "0"
+end
+
 case manufacturer
 when "HP"
   package "hponcfg"
   package "hp-health"
-  unit = "1"
-  speed = "115200"
+  units << "1"
 when "TYAN"
-  unit = "0"
-  speed = "115200"
+  units << "0"
 when "TYAN Computer Corporation"
-  unit = "0"
-  speed = "115200"
+  units << "0"
 when "Supermicro"
   case product
-  when "H8DGU", "X9SCD", "X7DBU", "X7DW3", "X9DR7/E-(J)LN4F", "X9DR3-F", "X9DRW"
-    unit = "1"
-    speed = "115200"
+  when "H8DGU", "X9SCD", "X7DBU", "X7DW3", "X9DR7/E-(J)LN4F", "X9DR3-F", "X9DRW", "SYS-2028U-TN24R4T+"
+    units << "1"
   else
-    unit = "0"
-    speed = "115200"
+    units << "0"
   end
 when "IBM"
-  unit = "0"
-  speed = "115200"
-end
-
-if manufacturer == "HP" && node[:lsb][:release].to_f > 11.10
-  include_recipe "git"
-
-  git "/opt/hp/hp-legacy" do
-    action :sync
-    repository "git://chef.openstreetmap.org/hp-legacy.git"
-    user "root"
-    group "root"
-    ignore_failure true
-  end
-
-  link "/opt/hp/hp-health/bin/hpasmd" do
-    to "/opt/hp/hp-legacy/hpasmd"
-  end
-
-  link "/usr/lib/libhpasmintrfc.so.3.0" do
-    to "/opt/hp/hp-legacy/libhpasmintrfc.so.3.0"
-  end
-
-  link "/usr/lib/libhpasmintrfc.so.3" do
-    to "libhpasmintrfc.so.3.0"
-  end
-
-  link "/usr/lib/libhpasmintrfc.so" do
-    to "libhpasmintrfc.so.3.0"
-  end
+  units << "0"
 end
 
-unless unit.nil?
-  file "/etc/init/ttySttyS#{unit}.conf" do
-    action :delete
-  end
+units.sort.uniq.each do |unit|
+  if node[:lsb][:release].to_f >= 16.04
+    service "serial-getty@ttyS#{unit}" do
+      action [:enable, :start]
+    end
+  else
+    file "/etc/init/ttySttyS#{unit}.conf" do
+      action :delete
+    end
 
-  template "/etc/init/ttyS#{unit}.conf" do
-    source "tty.conf.erb"
-    owner "root"
-    group "root"
-    mode 0644
-    variables :unit => unit, :speed => speed
-  end
+    template "/etc/init/ttyS#{unit}.conf" do
+      source "tty.conf.erb"
+      owner "root"
+      group "root"
+      mode 0644
+      variables :unit => unit
+    end
 
-  service "ttyS#{unit}" do
-    provider Chef::Provider::Service::Upstart
-    action [:enable, :start]
-    supports :status => true, :restart => true, :reload => false
-    subscribes :restart, "template[/etc/init/ttyS#{unit}.conf]"
+    service "ttyS#{unit}" do
+      provider Chef::Provider::Service::Upstart
+      action [:enable, :start]
+      supports :status => true, :restart => true, :reload => false
+      subscribes :restart, "template[/etc/init/ttyS#{unit}.conf]"
+    end
   end
 end
 
@@ -154,7 +132,7 @@ if File.exist?("/etc/default/grub")
     owner "root"
     group "root"
     mode 0644
-    variables :unit => unit, :speed => speed, :entry => grub_entry
+    variables :units => units, :entry => grub_entry
     notifies :run, "execute[update-grub]"
   end
 end
@@ -243,7 +221,7 @@ node[:block_device].each do |name, attributes|
   end
 end
 
-%w(hpacucli lsiutil sas2ircu megactl megacli arcconf).each do |tools_package|
+%w(hpssacli lsiutil sas2ircu megactl megacli arcconf).each do |tools_package|
   if tools_packages.include?(tools_package)
     package tools_package
   else
@@ -297,119 +275,44 @@ end
   end
 end
 
-disks = []
-
-node[:block_device].each do |name, attributes|
-  disks << { :device => name } if attributes[:vendor] == "ATA"
-end
-
-if status_packages["cciss-vol-status"] && File.exist?("/usr/sbin/cciss_vol_status")
-  status_packages["cciss-vol-status"].each do |device|
-    IO.popen(["cciss_vol_status", "-V", "/dev/#{device}"]).each do |line|
-      disks << { :device => device, :driver => "cciss", :id => Regexp.last_match[1].to_i - 1 } if line =~ / bay ([0-9]+) +HP /
-    end
-  end
-end
-
-if status_packages["megaclisas-status"] && File.exist?("/usr/sbin/megacli")
-  controller = 0
-
-  Dir.glob("/sys/class/scsi_host/host*") do |host|
-    driver = File.new("#{host}/proc_name").read.chomp
-
-    next unless driver == "megaraid_sas"
-
-    bus = host.sub("/sys/class/scsi_host/host", "")
-    device = File.basename(Dir.glob("/sys/bus/scsi/devices/#{bus}:*/scsi_generic/*").first)
-
-    IO.popen(["megacli", "-PDList", "-a#{controller}", "-NoLog"]).each do |line|
-      disks << { :device => device, :driver => "megaraid",  :id => Regexp.last_match[1] } if line =~ /^Device Id: ([0-9]+)$/
-
-      disks.pop if line =~ /^Firmware state: Hotspare, Spun down$/
-    end
-
-    controller += 1
-  end
-end
-
-if tools_packages.include?("lsiutil")
-  Dir.glob("/sys/class/scsi_host/host*") do |host|
-    driver = File.new("#{host}/proc_name").read.chomp
+disks = if node[:hardware][:disk]
+          node[:hardware][:disk][:disks]
+        else
+          []
+        end
 
-    next unless driver == "mptsas"
+disks = disks.map do |disk|
+  next if disk[:state] == "spun_down"
 
-    bus = host.sub("/sys/class/scsi_host/host", "")
+  if disk[:smart_device]
+    controller = node[:hardware][:disk][:controllers][disk[:controller]]
+    device = controller[:device].sub("/dev/", "")
+    smart = disk[:smart_device]
 
-    Dir.glob("/sys/bus/scsi/devices/#{bus}:0:*/scsi_generic/*").each do |sg|
-      disks << { :device => File.basename(sg) }
+    if device.start_with?("cciss/") && smart =~ /^cciss,(\d+)$/
+      array = node[:hardware][:disk][:arrays][disk[:arrays].first]
+      munin = "cciss-3#{array[:wwn]}-#{Regexp.last_match(1)}"
+    elsif smart =~ /^.*,(\d+)$/
+      munin = "#{device}-#{Regexp.last_match(1)}"
+    elsif smart =~ %r{^.*,(\d+)/(\d+)$}
+      munin = "#{device}-#{Regexp.last_match(1)}:#{Regexp.last_match(2)}"
     end
+  elsif disk[:device]
+    device = disk[:device].sub("/dev/", "")
+    munin = device
   end
-end
-
-if status_packages["sas2ircu-status"]
-  Dir.glob("/sys/class/scsi_host/host*") do |host|
-    driver = File.new("#{host}/proc_name").read.chomp
-
-    next unless driver == "mpt2sas" || driver == "mpt3sas"
 
-    bus = host.sub("/sys/class/scsi_host/host", "")
+  next if device.nil?
 
-    Dir.glob("/sys/bus/scsi/devices/#{bus}:0:*/scsi_generic/*").each do |sg|
-      next if File.directory?("#{sg}/../../block")
-
-      disks << { :device => File.basename(sg) }
-    end
-  end
+  Hash[
+    :device => device,
+    :smart => smart,
+    :munin => munin,
+    :hddtemp => munin.tr("-:", "_")
+  ]
 end
 
-if status_packages["aacraid-status"]
-  Dir.glob("/sys/class/scsi_host/host*") do |host|
-    driver = File.new("#{host}/proc_name").read.chomp
-
-    next unless driver == "aacraid"
-
-    bus = host.sub("/sys/class/scsi_host/host", "")
-
-    Dir.glob("/sys/bus/scsi/devices/#{bus}:1:*/scsi_generic/*").each do |sg|
-      disks << { :device => File.basename(sg) }
-    end
-  end
-end
-
-if tools_packages.include?("areca") && File.exist?("/opt/areca/x86_64/cli64")
-  device = IO.popen(["lsscsi", "-g"]).grep(%r{Areca +RAID controller .*/dev/(sg[0-9]+)}) do
-    Regexp.last_match[1]
-  end.first
-
-  IO.popen(["/opt/areca/x86_64/cli64", "disk", "info"]).each do |line|
-    next if line =~ /N\.A\./
-
-    if line =~ /^ +[0-9]+ +0*([0-9]+) +(?:Slot#|SLOT )0*([0-9]+) +/
-      enc = Regexp.last_match[1]
-      slot = Regexp.last_match[2]
-
-      disks << { :device => device, :driver => "areca", :id => "#{slot}/#{enc}" }
-    elsif line =~ /^ +([0-9]+) +[0-9]+ +/
-      disks << { :device => device, :driver => "areca", :id => Regexp.last_match[1] }
-    end
-  end
-end
-
-disks.each do |disk|
-  if disk[:device] =~ %r{^cciss/(.*)$}
-    id = File.read("/sys/bus/cciss/devices/#{Regexp.last_match[1]}/unique_id").chomp
-
-    disk[:munin] = "cciss-3#{id.downcase}"
-  else
-    disk[:munin] = disk[:device]
-  end
-
-  if disk[:id]
-    disk[:munin] = "#{disk[:munin]}-#{disk[:id].to_s.tr('/', ':')}"
-  end
-
-  disk[:hddtemp] = disk[:munin].tr("-:", "_")
-end
+disks = disks.compact
 
 if disks.count > 0
   package "smartmontools"
@@ -447,7 +350,7 @@ if disks.count > 0
   # an Areca controller as they only allow one thing to
   # talk to the controller at a time and smartd will
   # throw errors if it clashes with munin
-  disks = disks.reject { |disk| disk[:driver] == "areca" }
+  disks = disks.reject { |disk| disk[:smart] && disk[:smart].start_with?("areca,") }
 
   disks.each do |disk|
     munin_plugin "smart_#{disk[:munin]}" do
@@ -518,7 +421,11 @@ if node[:lsb][:release].to_f <= 12.10
   end
 else
   service "kmod" do
-    provider Chef::Provider::Service::Upstart
+    if node[:lsb][:release].to_f >= 15.10
+      provider Chef::Provider::Service::Systemd
+    else
+      provider Chef::Provider::Service::Upstart
+    end
     action :nothing
     subscribes :start, "template[/etc/modules]"
   end
@@ -547,15 +454,15 @@ unless Dir.glob("/sys/class/hwmon/hwmon*").empty?
     cpu = File.basename(coretemp).sub("coretemp.", "").to_i
     chip = format("coretemp-isa-%04d", cpu)
 
-    if File.exist?("#{coretemp}/name")
-      temps = Dir.glob("#{coretemp}/temp*_input").map do |temp|
-        File.basename(temp).sub("temp", "").sub("_input", "").to_i
-      end.sort
-    else
-      temps = Dir.glob("#{coretemp}/hwmon/hwmon*/temp*_input").map do |temp|
-        File.basename(temp).sub("temp", "").sub("_input", "").to_i
-      end.sort
-    end
+    temps = if File.exist?("#{coretemp}/name")
+              Dir.glob("#{coretemp}/temp*_input").map do |temp|
+                File.basename(temp).sub("temp", "").sub("_input", "").to_i
+              end.sort
+            else
+              Dir.glob("#{coretemp}/hwmon/hwmon*/temp*_input").map do |temp|
+                File.basename(temp).sub("temp", "").sub("_input", "").to_i
+              end.sort
+            end
 
     if temps.first == 1
       node.default[:hardware][:sensors][chip][:temps][:temp1][:label] = "CPU #{cpu}"