From 739adfe4b8d78c4c8d257513f497eccbc005986c Mon Sep 17 00:00:00 2001 From: Josh Branham Date: Tue, 6 Nov 2018 16:00:59 -0500 Subject: [PATCH] Remove package by name, not by path to package --- attributes/default.rb | 2 ++ libraries/provider_install.rb | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index e03527e2f..41a23ad3e 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -13,6 +13,8 @@ 'tarball' => 'https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-%s.tar.gz', } +default['elasticsearch']['package_base_name'] = 'elasticsearch' + # platform_family keyed download sha256 checksums default['elasticsearch']['checksums']['6.0.0']['debian'] = '28f38779156387c1db274d8d733429e574b54b4f518da6f0741f6276f8229939' default['elasticsearch']['checksums']['6.0.0']['rhel'] = '823fa8aa24e9948dea30f0a468f0403b34a62180e02ed752443d5964334c29a1' diff --git a/libraries/provider_install.rb b/libraries/provider_install.rb index beaeac51d..a024b0b08 100644 --- a/libraries/provider_install.rb +++ b/libraries/provider_install.rb @@ -140,11 +140,11 @@ def remove_package_wrapper_action filename = package_url.split('/').last pkg_r = if node['platform_family'] == 'debian' - dpkg_package "#{Chef::Config[:file_cache_path]}/#{filename}" do + dpkg_package "#{node['elasticsearch']['package_base_name']}" do action :nothing end else - package "#{Chef::Config[:file_cache_path]}/#{filename}" do + package "#{node['elasticsearch']['package_base_name']}" do action :nothing end end