X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/01492948652e950f3a1335576a491aa8963e66e9..695c1e5c1bb1dae68d7366f7e60991e65aec159a:/cookbooks/hardware/recipes/default.rb diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb index 689034a2a..05d5c0794 100644 --- a/cookbooks/hardware/recipes/default.rb +++ b/cookbooks/hardware/recipes/default.rb @@ -29,7 +29,7 @@ when "AuthenticAMD" end end -if node[:dmi] and node[:dmi][:system] +if node[:dmi] && node[:dmi][:system] case node[:dmi][:system][:manufacturer] when "empty" manufacturer = node[:dmi][:base_board][:manufacturer] @@ -69,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 @@ -111,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 @@ -148,6 +148,11 @@ 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 @@ -163,7 +168,7 @@ if node[:lsb][:release].to_f >= 12.10 end service "irqbalance" do - action [ :start, :enable ] + action [:start, :enable] supports :status => false, :restart => true, :reload => false subscribes :restart, "template[/etc/default/irqbalance]" end @@ -182,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"] ||= [] @@ -198,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 @@ -233,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 @@ -248,6 +253,90 @@ 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"] + 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 disks.count > 0 + package "smartmontools" + + template "/etc/smartd.conf" do + source "smartd.conf.erb" + owner "root" + group "root" + mode 0644 + variables :disks => disks + notifies :reload, "service[smartmontools]" + end + + template "/etc/default/smartmontools" do + source "smartmontools.erb" + owner "root" + group "root" + mode 0644 + notifies :restart, "service[smartmontools]" + end + + service "smartmontools" do + action [:enable, :start] + end +else + service "smartmontools" do + action [:stop, :disable] + 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" @@ -260,7 +349,7 @@ if node[:hardware][:watchdog] end service "watchdog" do - action [ :enable, :start ] + action [:enable, :start] end end