Avoid installing megaclisas-status on Ubuntu 22.04

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

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 7f1431320dd389d532e6157db5852150965a720b..ae00d3b9e098bd398cd10396b89ffda6a8a22f59 100644 (file)
--- 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 = {}
 
@@ -233,7 +239,7 @@ if node[:virtualization][:role] != "guest" ||
       status_packages["megaraid-status"] ||= []
     when "megaraid_sas"
       tools_packages << "megacli"
-      status_packages["megaclisas-status"] ||= []
+      status_packages["megaclisas-status"] ||= [] if node[:lsb][:release].to_f < 22.04
     when "aacraid"
       tools_packages << "arcconf"
       status_packages["aacraid-status"] ||= []
@@ -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?