Initial support for RHEL10 (via CentOS Stream 10)

jcpunk · jcpunk · commit 39bda4c2c136 · 2024-06-11T14:09:15.000-05:00
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
@@ -48,7 +48,7 @@
           end
 
           case [facts[:os]['family'], facts[:os]['release']['major']]
-          when %w[RedHat 7], %w[RedHat 9], %w[Debian 12]
+          when %w[RedHat 7], ["RedHat", 9..999], %w[Debian 12]
             it { is_expected.to contain_package('systemd-resolved') }
           else
             it { is_expected.not_to contain_package('systemd-resolved') }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`---`
`2`		`-systemd::resolved_package: 'systemd-resolved'`
`3`	`2`	`systemd::nspawn_package: ~`
`4`	`3`
`5`	`4`	`systemd::accounting:`