X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/b20599b6503be65674c3e420be6cca91b507ac0a..3a4d52bd4c0f8e6ae7679145846b7bc7845d8ace:/cookbooks/hardware/attributes/default.rb?ds=sidebyside diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb index 2a4e8e272..98c6f9186 100644 --- a/cookbooks/hardware/attributes/default.rb +++ b/cookbooks/hardware/attributes/default.rb @@ -1,14 +1,14 @@ -default[:hardware][:modules] = [ "loop", "lp", "rtc" ] +default[:hardware][:modules] = %w(loop lp rtc) default[:hardware][:sensors] = {} -if node[:dmi] and node[:dmi][:system] +if node[:dmi] && node[:dmi][:system] case dmi.system.manufacturer when "HP" default[:apt][:sources] |= [ "management-component-pack" ] case dmi.system.product_name - when "ProLiant DL360 G6", "ProLiant DL360 G7" - default[:hardware][:sensors]["power_meter-*"][:power]["power1"] = { :ignore => true } + when "ProLiant DL360 G6", "ProLiant DL360 G7" + default[:hardware][:sensors]["power_meter-*"][:power]["power1"] = { :ignore => true } end end end @@ -21,8 +21,8 @@ if Chef::Util.compare_versions(node[:kernel][:release], [3, 3]) < 0 end end -if node[:kernel] and node[:kernel][:modules] - raidmods = node[:kernel][:modules].keys & ["cciss", "hpsa", "mptsas", "mpt2sas", "megaraid_mm", "megaraid_sas", "aacraid"] +if node[:kernel] && node[:kernel][:modules] + raidmods = node[:kernel][:modules].keys & %w(cciss hpsa mptsas mpt2sas megaraid_mm megaraid_sas aacraid) unless raidmods.empty? default[:apt][:sources] |= [ "hwraid" ]