Fix path to lldpctl

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

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 596d2701d94bec4c15b0683ea25c0578a4a36db1..751810a3e9faa5f63c98efafb6d6450230f7c8a0 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -199,13 +199,17 @@ service "irqbalance" do
   supports :status => false, :restart => true, :reload => false
 end
 
   supports :status => false, :restart => true, :reload => false
 end
 

-# Link Layer Discovery Protocol Daemon

 package "lldpd"
 package "lldpd"

+

 service "lldpd" do
   action [:start, :enable]
   supports :status => true, :restart => true, :reload => true
 end
 
 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 = {}
 
 tools_packages = []
 status_packages = {}
 


@@ -353,6 +357,10 @@ nvmes = if node[:hardware][:pci]
           []
         end
 
           []
         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?
 intel_nvmes = nvmes.select { |pci| pci[:vendor_name] == "Intel Corporation" }
 
 if !intel_ssds.empty? || !intel_nvmes.empty?


@@ -540,16 +548,21 @@ if File.exist?("/etc/mdadm/mdadm.conf")
   end
 end
 
   end
 end
 

-template "/etc/modules" do
-  source "modules.erb"
-  owner "root"
-  group "root"
-  mode "644"
+file "/etc/modules" do
+  action :delete

 end
 
 end
 

-service "kmod" do
-  action :nothing
-  subscribes :start, "template[/etc/modules]"
+node[:hardware][:modules].each do |module_name|
+  kernel_module module_name do
+    action :install
+    not_if { kitchen? }
+  end
+end
+
+node[:hardware][:blacklisted_modules].each do |module_name|
+  kernel_module module_name do
+    action :blacklist
+  end

 end
 
 if node[:hardware][:watchdog]
 end
 
 if node[:hardware][:watchdog]