diff options
author | Thom May <thom@may.lt> | 2017-10-03 17:27:35 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-03 17:27:35 -0700 |
commit | b04a46f222af1d24329fa554bf83fc8b3fc0769f (patch) | |
tree | 8ebfedf403240f5d6732267404d8b1ce65ef8707 | |
parent | 10561bbff3bfbca61f406d438f510667e3e1e066 (diff) | |
parent | 78632194bc100cf1aeda04ac09168609c0270ba8 (diff) | |
download | chef-b04a46f222af1d24329fa554bf83fc8b3fc0769f.tar.gz |
Merge pull request #6435 from NaomiReeves/fix_dnf_resource
dnf_resource: be more specific for rhel packages
-rw-r--r-- | lib/chef/resource/dnf_package.rb | 4 | ||||
-rw-r--r-- | spec/unit/provider_resolver_spec.rb | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/chef/resource/dnf_package.rb b/lib/chef/resource/dnf_package.rb index d92dc12ec7..5713852d6f 100644 --- a/lib/chef/resource/dnf_package.rb +++ b/lib/chef/resource/dnf_package.rb @@ -29,10 +29,12 @@ class Chef allowed_actions :install, :upgrade, :remove, :purge, :reconfig, :lock, :unlock, :flush_cache - provides :package, platform_family: %w{rhel fedora amazon} do + provides :package, platform_family: %w{fedora amazon} do which("dnf") && shell_out("rpm -q dnf").stdout =~ /^dnf-[1-9]/ end + provides :package, platform_family: %{rhel}, platform_version: ">= 8" + provides :dnf_package # Install a specific arch diff --git a/spec/unit/provider_resolver_spec.rb b/spec/unit/provider_resolver_spec.rb index 1902fb5375..d1aaa6a8ea 100644 --- a/spec/unit/provider_resolver_spec.rb +++ b/spec/unit/provider_resolver_spec.rb @@ -708,18 +708,21 @@ describe Chef::ProviderResolver do "rhel" => { # service: [ Chef::Resource::SystemdService, Chef::Provider::Service::Systemd ], - package: [ Chef::Resource::YumPackage, Chef::Provider::Package::Yum ], + package: [ Chef::Resource::DnfPackage, Chef::Provider::Package::Dnf ], ifconfig: [ Chef::Resource::Ifconfig, Chef::Provider::Ifconfig::Redhat ], %w{amazon xcp xenserver ibm_powerkvm cloudlinux parallels} => { "3.1.4" => { + package: [ Chef::Resource::YumPackage, Chef::Provider::Package::Yum ], # service: [ Chef::Resource::RedhatService, Chef::Provider::Service::Redhat ], }, }, %w{redhat centos scientific oracle} => { "7.0" => { + package: [ Chef::Resource::YumPackage, Chef::Provider::Package::Yum ], }, "6.0" => { + package: [ Chef::Resource::YumPackage, Chef::Provider::Package::Yum ], # service: [ Chef::Resource::RedhatService, Chef::Provider::Service::Redhat ], }, }, |