Convert ohai_plugin to an LWRP

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

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index a508fff6b55e7e3be4770a48f3469bb7e8a8de58..dd2d8015727afc1ccc716fb234eace7cbae45065 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -29,7 +29,7 @@ when "AuthenticAMD"
   end
 end
 
-if node[:dmi] and node[:dmi][:system]
+if node[:dmi] && node[:dmi][:system]
   case node[:dmi][:system][:manufacturer]
   when "empty"
     manufacturer = node[:dmi][:base_board][:manufacturer]
@@ -69,7 +69,7 @@ when "IBM"
   speed = "115200"
 end
 
-if manufacturer == "HP" and node[:lsb][:release].to_f > 11.10
+if manufacturer == "HP" && node[:lsb][:release].to_f > 11.10
   include_recipe "git"
 
   git "/opt/hp/hp-legacy" do
@@ -111,7 +111,7 @@ unless unit.nil?
 
   service "ttyS#{unit}" do
     provider Chef::Provider::Service::Upstart
-    action [ :enable, :start ]
+    action [:enable, :start]
     supports :status => true, :restart => true, :reload => false
     subscribes :restart, "template[/etc/init/ttyS#{unit}.conf]"
   end
@@ -168,7 +168,7 @@ if node[:lsb][:release].to_f >= 12.10
   end
 
   service "irqbalance" do
-    action [ :start, :enable ]
+    action [:start, :enable]
     supports :status => false, :restart => true, :reload => false
     subscribes :restart, "template[/etc/default/irqbalance]"
   end
@@ -187,7 +187,7 @@ node[:kernel][:modules].each_key do |modname|
     status_packages["cciss-vol-status"] ||= []
   when "mptsas"
     tools_packages << "lsiutil"
-    #status_packages["mpt-status"] ||= []
+    # status_packages["mpt-status"] ||= []
   when "mpt2sas"
     tools_packages << "sas2ircu"
     status_packages["sas2ircu-status"] ||= []
@@ -203,19 +203,19 @@ node[:kernel][:modules].each_key do |modname|
   end
 end
 
-node[:block_device].each do |name,attributes|
-  if attributes[:vendor] == "HP" and attributes[:model] == "LOGICAL VOLUME"
-    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) ]
-      end
+node[:block_device].each do |name, attributes|
+  next unless attributes[:vendor] == "HP" && attributes[:model] == "LOGICAL VOLUME"
+
+  if name =~ /^cciss!(c[0-9]+)d[0-9]+$/
+    status_packages["cciss-vol-status"] |= ["cciss/#{Regexp.last_match[1]}d0"]
+  else
+    Dir.glob("/sys/block/#{name}/device/scsi_generic/*").each do |sg|
+      status_packages["cciss-vol-status"] |= [File.basename(sg)]
     end
   end
 end
 
-["hpacucli", "lsiutil", "sas2ircu", "megactl", "megacli", "arcconf"].each do |tools_package|
+%w(hpacucli lsiutil sas2ircu megactl megacli arcconf).each do |tools_package|
   if tools_packages.include?(tools_package)
     package tools_package
   else
@@ -238,7 +238,7 @@ end
     end
 
     service "#{status_package}d" do
-      action [ :start, :enable ]
+      action [:start, :enable]
       supports :status => false, :restart => true, :reload => false
       subscribes :restart, "template[/etc/default/#{status_package}d]"
     end
@@ -253,7 +253,7 @@ end
   end
 end
 
-if File.exists?("/etc/mdadm/mdadm.conf")
+if File.exist?("/etc/mdadm/mdadm.conf")
   mdadm_conf = edit_file "/etc/mdadm/mdadm.conf" do |line|
     line.gsub!(/^MAILADDR .*$/, "MAILADDR admins@openstreetmap.org")
 
@@ -306,7 +306,7 @@ if node[:hardware][:watchdog]
   end
 
   service "watchdog" do
-    action [ :enable, :start ]
+    action [:enable, :start]
   end
 end