Merge pull request #159 from KeithWard/centos_8_dnf_yum

Fedora/CentOS8: Ensure yum-utils/dnf-utils are present
voxpupuli · Jan 30, 2020 · 4b60617 · 4b60617
2 parents 7fc2d1f + 4632133
commit 4b60617
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 14 deletions.
diff --git a/data/os/RedHat/Amazon/8.yaml b/data/os/RedHat/Amazon/8.yaml
diff --git a/data/os/RedHat/CentOS/8.yaml b/data/os/RedHat/CentOS/8.yaml
diff --git a/data/os/RedHat/RedHat/8.yaml b/data/os/RedHat/RedHat/8.yaml
diff --git a/data/os/RedHat/VirtuozzoLinux/8.yaml b/data/os/RedHat/VirtuozzoLinux/8.yaml
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -363,16 +363,12 @@
 
       context 'when utils_package_name is not set' do
         case facts[:os]['name']
-        when 'Fedora', 'RedHat', 'CentOS', 'Scientific', 'Amazon', 'OEL', 'OracleLinux'
-          case facts[:os]['release']['major']
-          when '8', '27', '28', '29', '30', '31', '32'
-            it { is_expected.to contain_package('dnf-utils') }
-          end
+        when 'Fedora'
+          it { is_expected.to contain_package('dnf-utils') }
         else
           it { is_expected.to contain_package('yum-utils') }
         end
       end
-
       context 'when utils_package_name is set' do
         let(:params) { { utils_package_name: 'dnf-utils' } }