X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0e39eff9759a6ae4c50c5ed8eeb9e8bef2d2ad64..9ea8db68462908a53d1721e34f6aaff3645d595b:/cookbooks/hardware/recipes/default.rb

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 7736cd507..7e403a0d6 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -62,11 +62,13 @@ when "HP"
   package "hp-health" do
     action :install
     notifies :restart, "service[hp-health]"
+    only_if { node[:lsb][:release].to_f < 22.04 }
   end
 
   service "hp-health" do
     action [:enable, :start]
     supports :status => true, :restart => true
+    only_if { node[:lsb][:release].to_f < 22.04 }
   end
 
   if product.end_with?("Gen8", "Gen9")
@@ -199,13 +201,17 @@ service "irqbalance" do
   supports :status => false, :restart => true, :reload => false
 end
 
-# Link Layer Discovery Protocol Daemon
 package "lldpd"
+
 service "lldpd" do
   action [:start, :enable]
   supports :status => true, :restart => true, :reload => true
 end
 
+ohai_plugin "lldp" do
+  template "lldp.rb.erb"
+end
+
 tools_packages = []
 status_packages = {}
 
@@ -236,7 +242,7 @@ if node[:virtualization][:role] != "guest" ||
       status_packages["megaclisas-status"] ||= []
     when "aacraid"
       tools_packages << "arcconf"
-      status_packages["aacraid-status"] ||= []
+      status_packages["aacraid-status"] ||= [] if node[:lsb][:release].to_f < 22.04
     when "arcmsr"
       tools_packages << "areca"
     end
@@ -353,6 +359,10 @@ nvmes = if node[:hardware][:pci]
           []
         end
 
+unless nvmes.empty?
+  package "nvme-cli"
+end
+
 intel_nvmes = nvmes.select { |pci| pci[:vendor_name] == "Intel Corporation" }
 
 if !intel_ssds.empty? || !intel_nvmes.empty?
@@ -547,6 +557,7 @@ end
 node[:hardware][:modules].each do |module_name|
   kernel_module module_name do
     action :install
+    not_if { kitchen? }
   end
 end