diff options
| author | Thom May <thom@may.lt> | 2017-10-03 17:29:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-03 17:29:40 -0700 |
| commit | 11b1fe9b5da8e5bc0073355dfdc8c626a39a839a (patch) | |
| tree | 19ab4f467fa8fae7c4ce9d10c2aa081d8f1567fe | |
| parent | 5e5d4656642a090cb9e9fa8a672b2b33ca4503a2 (diff) | |
| parent | a9bca6f5bdafa743c15a3bd299892af7e8feb2c8 (diff) | |
| download | chef-11b1fe9b5da8e5bc0073355dfdc8c626a39a839a.tar.gz | |
Merge pull request #6436 from NaomiReeves/backport_dnf_resource
Backport #6435 to Chef-12: dnf_resource
| -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 f10c282f19..2aea2c4457 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} do + provides :package, platform_family: %w{fedora} 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 56bc27d075..fc50336fee 100644 --- a/spec/unit/provider_resolver_spec.rb +++ b/spec/unit/provider_resolver_spec.rb @@ -709,18 +709,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 ], }, }, |