diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-10-11 09:12:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-11 09:12:54 -0700 |
| commit | bd741b6128e93dc90a2943f8ca29e6b8cc378389 (patch) | |
| tree | d778ba7774e21da3b45aae2270ca26869f9db8bf | |
| parent | 5c5073241607cdd6df342677b543a47774867a79 (diff) | |
| parent | c512fb653b538bdf77802ac79c8a5baba8459459 (diff) | |
| download | chef-bd741b6128e93dc90a2943f8ca29e6b8cc378389.tar.gz | |
Merge pull request #6490 from chef/lcg/dnf-platform-tweaks
only rhel >= 8 and fedora >= 22 get dnf
| -rw-r--r-- | lib/chef/provider/package/dnf.rb | 15 | ||||
| -rw-r--r-- | lib/chef/resource/dnf_package.rb | 13 |
2 files changed, 19 insertions, 9 deletions
diff --git a/lib/chef/provider/package/dnf.rb b/lib/chef/provider/package/dnf.rb index a602a9b768..7843bc74fc 100644 --- a/lib/chef/provider/package/dnf.rb +++ b/lib/chef/provider/package/dnf.rb @@ -35,13 +35,18 @@ class Chef use_multipackage_api use_package_name_for_source - provides :package, platform_family: %w{fedora amazon} do - which("dnf") && shell_out("rpm -q dnf").stdout =~ /^dnf-[1-9]/ - end + # all rhel variants >= 8 will use DNF + provides :package, platform_family: "rhel", platform_version: ">= 8" + + # fedora >= 22 uses DNF + provides :package, platform: "fedora", platform_version: ">= 22" - provides :package, platform_family: %w{rhel}, platform_version: ">= 8" + # amazon will eventually use DNF + provides :package, platform: "amazon" do + which("dnf") + end - provides :dnf_package, os: "linux" + provides :dnf_package # # Most of the magic in this class happens in the python helper script. The ruby side of this diff --git a/lib/chef/resource/dnf_package.rb b/lib/chef/resource/dnf_package.rb index 5713852d6f..05ed895e70 100644 --- a/lib/chef/resource/dnf_package.rb +++ b/lib/chef/resource/dnf_package.rb @@ -29,11 +29,16 @@ class Chef allowed_actions :install, :upgrade, :remove, :purge, :reconfig, :lock, :unlock, :flush_cache - provides :package, platform_family: %w{fedora amazon} do - which("dnf") && shell_out("rpm -q dnf").stdout =~ /^dnf-[1-9]/ - end + # all rhel variants >= 8 will use DNF + provides :package, platform_family: "rhel", platform_version: ">= 8" + + # fedora >= 22 uses DNF + provides :package, platform: "fedora", platform_version: ">= 22" - provides :package, platform_family: %{rhel}, platform_version: ">= 8" + # amazon will eventually use DNF + provides :package, platform: "amazon" do + which("dnf") + end provides :dnf_package |