Set erchef['base_resource_url'] in chef service configuration

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

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index a81e0966c3df05dc6385f30dfdf0ee6df2555e89..0f3a77353e1c9baecd34d05f1b3eb7a3a969ca89 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -22,6 +22,13 @@ when "GenuineIntel"
   package "intel-microcode"
 end
 
   package "intel-microcode"
 end
 

+case node[:cpu][:"0"][:vendor_id]
+when "AuthenticAMD"
+  if node[:lsb][:release].to_f >= 14.04
+    package "amd64-microcode"
+  end
+end
+

 if node[:dmi] and node[:dmi][:system]
   case node[:dmi][:system][:manufacturer]
   when "empty"
 if node[:dmi] and node[:dmi][:system]
   case node[:dmi][:system][:manufacturer]
   when "empty"


@@ -50,7 +57,7 @@ when "TYAN Computer Corporation"
   speed = "115200"
 when "Supermicro"
   case product
   speed = "115200"
 when "Supermicro"
   case product

-  when "H8DGU", "X9SCD", "X7DBU", "X7DW3", "X9DR7/E-(J)LN4F", "X9DR3-F"
+  when "H8DGU", "X9SCD", "X7DBU", "X7DW3", "X9DR7/E-(J)LN4F", "X9DR3-F", "X9DRW"

     unit = "1"
     speed = "115200"
   else
     unit = "1"
     speed = "115200"
   else


@@ -106,7 +113,7 @@ unless unit.nil?
     provider Chef::Provider::Service::Upstart
     action [ :enable, :start ]
     supports :status => true, :restart => true, :reload => false
     provider Chef::Provider::Service::Upstart
     action [ :enable, :start ]
     supports :status => true, :restart => true, :reload => false

-    subscribes :restart, resources(:template => "/etc/init/ttyS#{unit}.conf")
+    subscribes :restart, "template[/etc/init/ttyS#{unit}.conf]"

   end
 end
 
   end
 end
 


@@ -122,7 +129,7 @@ if File.exist?("/etc/default/grub")
     group "root"
     mode 0644
     variables :unit => unit, :speed => speed
     group "root"
     mode 0644
     variables :unit => unit, :speed => speed

-    notifies :run, resources(:execute => "update-grub")
+    notifies :run, "execute[update-grub]"

   end
 end
 
   end
 end
 


@@ -141,6 +148,26 @@ template "/etc/initramfs-tools/conf.d/mdadm" do
   notifies :run, "execute[update-initramfs]"
 end
 
   notifies :run, "execute[update-initramfs]"
 end
 

+if node[:kernel][:modules].include?("ipmi_si")
+  package "ipmitool"
+end
+
+package "irqbalance"
+if node[:lsb][:release].to_f >= 12.10
+    template "/etc/default/irqbalance" do
+      source "irqbalance.erb"
+      owner "root"
+      group "root"
+      mode 0644
+    end
+
+    service "irqbalance" do
+      action [ :start, :enable ]
+      supports :status => false, :restart => true, :reload => false
+      subscribes :restart, "template[/etc/default/irqbalance]"
+    end
+end
+

 tools_packages = []
 status_packages = {}
 
 tools_packages = []
 status_packages = {}
 


@@ -172,8 +199,8 @@ end
 
 node[:block_device].each do |name,attributes|
   if attributes[:vendor] == "HP" and attributes[:model] == "LOGICAL VOLUME"
 
 node[:block_device].each do |name,attributes|
   if attributes[:vendor] == "HP" and attributes[:model] == "LOGICAL VOLUME"

-    if name =~ /^cciss!(.*)$/
-      status_packages["cciss-vol-status"] |= [ "cciss/#{$1}" ]
+    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) ]
     else
       Dir.glob("/sys/block/#{name}/device/scsi_generic/*").each do |sg|
         status_packages["cciss-vol-status"] |= [ File.basename(sg) ]