From e4d7de6289263f15e40e529855f84b9b38be3fe3 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 24 Oct 2017 15:39:44 +0100 Subject: [PATCH] Remove hpssacli with ssacli --- cookbooks/hardware/recipes/default.rb | 6 +++--- cookbooks/hardware/templates/default/ohai.rb.erb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb index e067a0b10..a0544149c 100644 --- a/cookbooks/hardware/recipes/default.rb +++ b/cookbooks/hardware/recipes/default.rb @@ -206,10 +206,10 @@ status_packages = {} node[:kernel][:modules].each_key do |modname| case modname when "cciss" - tools_packages << "hpssacli" + tools_packages << "ssacli" status_packages["cciss-vol-status"] ||= [] when "hpsa" - tools_packages << "hpssacli" + tools_packages << "ssacli" status_packages["cciss-vol-status"] ||= [] when "mptsas" tools_packages << "lsiutil" @@ -243,7 +243,7 @@ node[:block_device].each do |name, attributes| end end -%w[hpssacli lsiutil sas2ircu megactl megacli arcconf].each do |tools_package| +%w[ssacli lsiutil sas2ircu megactl megacli arcconf].each do |tools_package| if tools_packages.include?(tools_package) package tools_package else diff --git a/cookbooks/hardware/templates/default/ohai.rb.erb b/cookbooks/hardware/templates/default/ohai.rb.erb index 1c19a450f..52c0752ea 100644 --- a/cookbooks/hardware/templates/default/ohai.rb.erb +++ b/cookbooks/hardware/templates/default/ohai.rb.erb @@ -148,7 +148,7 @@ Ohai.plugin(:Hardware) do find_direct_disks(disk) find_nvme_disks(disk) - find_hp_disks(disk) if File.exist?("/usr/sbin/hpssacli") + find_hp_disks(disk) if File.exist?("/usr/sbin/ssacli") find_megaraid_disks(disk) if File.exist?("/usr/sbin/megacli") find_mpt1_disks(disk) if File.exist?("/usr/sbin/lsiutil") find_mpt2_disks(disk) if File.exist?("/usr/sbin/sas2ircu") @@ -286,7 +286,7 @@ Ohai.plugin(:Hardware) do array = nil disk = nil - IO.popen(%w(hpssacli controller all show config detail)).each do |line| + IO.popen(%w(ssacli controller all show config detail)).each do |line| if line =~ /^Smart Array (\S+) / controller = { :id => devices[:controllers].count, -- 2.43.2