Revert "Don't include the networking recipe"

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

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 2f8a4398e8d2805910b0eda719741a259d691244..13e24b80db2b1db4909b55accde37bebf7a50e44 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -50,78 +50,56 @@ else
   product = "Unknown"
 end
 
   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"
 case manufacturer
 when "HP"
   package "hponcfg"
   package "hp-health"

-  unit = "1"
-  speed = "115200"
+  units << "1"

 when "TYAN"
 when "TYAN"

-  unit = "0"
-  speed = "115200"
+  units << "0"

 when "TYAN Computer Corporation"
 when "TYAN Computer Corporation"

-  unit = "0"
-  speed = "115200"
+  units << "0"

 when "Supermicro"
   case product
 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
   else

-    unit = "0"
-    speed = "115200"
+    units << "0"

   end
 when "IBM"
   end
 when "IBM"

-  unit = "0"
-  speed = "115200"
+  units << "0"

 end
 
 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
-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 0o644
+      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
 
   end
 end
 


@@ -153,8 +131,8 @@ if File.exist?("/etc/default/grub")
     source "grub.erb"
     owner "root"
     group "root"
     source "grub.erb"
     owner "root"
     group "root"

-    mode 0644
-    variables :unit => unit, :speed => speed, :entry => grub_entry
+    mode 0o644
+    variables :units => units, :entry => grub_entry

     notifies :run, "execute[update-grub]"
   end
 end
     notifies :run, "execute[update-grub]"
   end
 end


@@ -170,7 +148,7 @@ template "/etc/initramfs-tools/conf.d/mdadm" do
   source "initramfs-mdadm.erb"
   owner "root"
   group "root"
   source "initramfs-mdadm.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   notifies :run, "execute[update-initramfs]"
 end
 
   notifies :run, "execute[update-initramfs]"
 end
 


@@ -190,7 +168,7 @@ if node[:lsb][:release].to_f >= 12.10
     source "irqbalance.erb"
     owner "root"
     group "root"
     source "irqbalance.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

   end
 
   service "irqbalance" do
   end
 
   service "irqbalance" do


@@ -277,7 +255,7 @@ end
       source "raid.default.erb"
       owner "root"
       group "root"
       source "raid.default.erb"
       owner "root"
       group "root"

-      mode 0644
+      mode 0o644

       variables :devices => status_packages[status_package]
     end
 
       variables :devices => status_packages[status_package]
     end
 


@@ -297,10 +275,57 @@ end
   end
 end
 
   end
 end
 

-disks = node[:hardware][:disk][:disks].map do |disk|
+disks = if node[:hardware][:disk]
+          node[:hardware][:disk][:disks]
+        else
+          []
+        end
+
+intel_ssds = disks.select { |d| d[:vendor] == "INTEL" && d[:model] =~ /^SSD/ }
+
+nvmes = if node[:hardware][:pci]
+          node[:hardware][:pci].values.select { |pci| pci[:driver] == "nvme" }
+        else
+          []
+        end
+
+intel_nvmes = nvmes.select { |pci| pci[:vendor_name] == "Intel Corporation" }
+
+if !intel_ssds.empty? || !intel_nvmes.empty?
+  package "unzip"
+  package "alien"
+
+  remote_file "#{Chef::Config[:file_cache_path]}/DataCenterTool_3_0_0_Linux.zip" do
+    source "https://downloadmirror.intel.com/23931/eng/DataCenterTool_3_0_0_Linux.zip"
+  end
+
+  execute "unzip-DataCenterTool" do
+    command "unzip DataCenterTool_3_0_0_Linux.zip isdct-3.0.0.400-15.x86_64.rpm"
+    cwd Chef::Config[:file_cache_path]
+    user "root"
+    group "root"
+    not_if { File.exist?("#{Chef::Config[:file_cache_path]}/isdct-3.0.0.400-15.x86_64.rpm") }
+  end
+
+  execute "alien-isdct" do
+    command "alien --to-deb isdct-3.0.0.400-15.x86_64.rpm"
+    cwd Chef::Config[:file_cache_path]
+    user "root"
+    group "root"
+    not_if { File.exist?("#{Chef::Config[:file_cache_path]}/isdct_3.0.0.400-16_amd64.deb") }
+  end
+
+  dpkg_package "isdct" do
+    source "#{Chef::Config[:file_cache_path]}/isdct_3.0.0.400-16_amd64.deb"
+  end
+end
+
+disks = disks.map do |disk|
+  next if disk[:state] == "spun_down"
+

   if disk[:smart_device]
     controller = node[:hardware][:disk][:controllers][disk[:controller]]
   if disk[:smart_device]
     controller = node[:hardware][:disk][:controllers][disk[:controller]]

-    device = File.basename(controller[:device])
+    device = controller[:device].sub("/dev/", "")

     smart = disk[:smart_device]
 
     if device.start_with?("cciss/") && smart =~ /^cciss,(\d+)$/
     smart = disk[:smart_device]
 
     if device.start_with?("cciss/") && smart =~ /^cciss,(\d+)$/


@@ -311,11 +336,13 @@ disks = node[:hardware][:disk][:disks].map do |disk|
     elsif smart =~ %r{^.*,(\d+)/(\d+)$}
       munin = "#{device}-#{Regexp.last_match(1)}:#{Regexp.last_match(2)}"
     end
     elsif smart =~ %r{^.*,(\d+)/(\d+)$}
       munin = "#{device}-#{Regexp.last_match(1)}:#{Regexp.last_match(2)}"
     end

-  else
-    device = File.basename(disk[:device])
+  elsif disk[:device]
+    device = disk[:device].sub("/dev/", "")

     munin = device
   end
 
     munin = device
   end
 

+  next if device.nil?
+

   Hash[
     :device => device,
     :smart => smart,
   Hash[
     :device => device,
     :smart => smart,


@@ -324,6 +351,8 @@ disks = node[:hardware][:disk][:disks].map do |disk|
   ]
 end
 
   ]
 end
 

+disks = disks.compact
+

 if disks.count > 0
   package "smartmontools"
 
 if disks.count > 0
   package "smartmontools"
 


@@ -331,14 +360,14 @@ if disks.count > 0
     source "smartd-mailer.erb"
     owner "root"
     group "root"
     source "smartd-mailer.erb"
     owner "root"
     group "root"

-    mode 0755
+    mode 0o755

   end
 
   template "/etc/smartd.conf" do
     source "smartd.conf.erb"
     owner "root"
     group "root"
   end
 
   template "/etc/smartd.conf" do
     source "smartd.conf.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     variables :disks => disks
     notifies :reload, "service[smartmontools]"
   end
     variables :disks => disks
     notifies :reload, "service[smartmontools]"
   end


@@ -347,7 +376,7 @@ if disks.count > 0
     source "smartmontools.erb"
     owner "root"
     group "root"
     source "smartmontools.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     notifies :restart, "service[smartmontools]"
   end
 
     notifies :restart, "service[smartmontools]"
   end
 


@@ -406,7 +435,7 @@ if File.exist?("/etc/mdadm/mdadm.conf")
   file "/etc/mdadm/mdadm.conf" do
     owner "root"
     group "root"
   file "/etc/mdadm/mdadm.conf" do
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     content mdadm_conf
   end
 
     content mdadm_conf
   end
 


@@ -420,7 +449,7 @@ template "/etc/modules" do
   source "modules.erb"
   owner "root"
   group "root"
   source "modules.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

 end
 
 if node[:lsb][:release].to_f <= 12.10
 end
 
 if node[:lsb][:release].to_f <= 12.10


@@ -431,7 +460,11 @@ if node[:lsb][:release].to_f <= 12.10
   end
 else
   service "kmod" do
   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
     action :nothing
     subscribes :start, "template[/etc/modules]"
   end


@@ -444,7 +477,7 @@ if node[:hardware][:watchdog]
     source "watchdog.erb"
     owner "root"
     group "root"
     source "watchdog.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     variables :module => node[:hardware][:watchdog]
   end
 
     variables :module => node[:hardware][:watchdog]
   end
 


@@ -460,15 +493,15 @@ unless Dir.glob("/sys/class/hwmon/hwmon*").empty?
     cpu = File.basename(coretemp).sub("coretemp.", "").to_i
     chip = format("coretemp-isa-%04d", cpu)
 
     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}"
 
     if temps.first == 1
       node.default[:hardware][:sensors][chip][:temps][:temp1][:label] = "CPU #{cpu}"


@@ -491,7 +524,7 @@ unless Dir.glob("/sys/class/hwmon/hwmon*").empty?
     source "sensors.conf.erb"
     owner "root"
     group "root"
     source "sensors.conf.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     notifies :run, "execute[/etc/sensors.d/chef.conf]"
   end
 end
     notifies :run, "execute[/etc/sensors.d/chef.conf]"
   end
 end