Merge pull request #468 from jcpunk/EL10

Rework Red Hat resolved package list to be more future proof
voxpupuli · Jun 13, 2024 · 38bd9da · 38bd9da
2 parents 09c86ae + 5178049
commit 38bd9da
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/data/RedHat-family-7.yaml b/data/RedHat-family-7.yaml
@@ -1,5 +1,4 @@
 ---
-systemd::resolved_package: 'systemd-resolved'
 systemd::nspawn_package: ~
 
 systemd::accounting:

diff --git a/data/RedHat-family-8.yaml b/data/RedHat-family-8.yaml
@@ -1,4 +1,6 @@
 ---
+systemd::resolved_package: ~
+
 systemd::accounting:
   DefaultCPUAccounting: 'yes'
   DefaultBlockIOAccounting: 'yes'

diff --git a/data/RedHat-family-9.yaml b/data/RedHat-family-9.yaml
@@ -1,5 +1,4 @@
 ---
-systemd::resolved_package: 'systemd-resolved'
 systemd::oomd_package: 'systemd-oomd'
 
 systemd::accounting:

diff --git a/data/RedHat-family.yaml b/data/RedHat-family.yaml
@@ -1,3 +1,4 @@
 ---
 systemd::networkd_package: systemd-networkd
 systemd::nspawn_package: 'systemd-container'
+systemd::resolved_package: 'systemd-resolved'
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -47,8 +47,7 @@
             it { is_expected.not_to contain_package('systemd-networkd') }
           end
 
-          case [facts[:os]['family'], facts[:os]['release']['major']]
-          when %w[RedHat 7], %w[RedHat 9], %w[Debian 12]
+          if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'] != '8') || (facts[:os]['name'] == 'Debian' && facts[:os]['release']['major'] == '12')
             it { is_expected.to contain_package('systemd-resolved') }
           else
             it { is_expected.not_to contain_package('systemd-resolved') }