Skip to content

Commit 5178049

Browse files
committed
Rework package list to be more future proof
1 parent e602e3d commit 5178049

File tree

5 files changed

+4
-4
lines changed

5 files changed

+4
-4
lines changed

data/RedHat-family-7.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
systemd::resolved_package: 'systemd-resolved'
32
systemd::nspawn_package: ~
43

54
systemd::accounting:

data/RedHat-family-8.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
---
2+
systemd::resolved_package: ~
3+
24
systemd::accounting:
35
DefaultCPUAccounting: 'yes'
46
DefaultBlockIOAccounting: 'yes'

data/RedHat-family-9.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
systemd::resolved_package: 'systemd-resolved'
32
systemd::oomd_package: 'systemd-oomd'
43

54
systemd::accounting:

data/RedHat-family.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
---
22
systemd::networkd_package: systemd-networkd
33
systemd::nspawn_package: 'systemd-container'
4+
systemd::resolved_package: 'systemd-resolved'

spec/classes/init_spec.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@
4747
it { is_expected.not_to contain_package('systemd-networkd') }
4848
end
4949

50-
case [facts[:os]['family'], facts[:os]['release']['major']]
51-
when %w[RedHat 7], %w[RedHat 9], %w[Debian 12]
50+
if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'] != '8') || (facts[:os]['name'] == 'Debian' && facts[:os]['release']['major'] == '12')
5251
it { is_expected.to contain_package('systemd-resolved') }
5352
else
5453
it { is_expected.not_to contain_package('systemd-resolved') }

0 commit comments

Comments
 (0)