Merge pull request #257 from traylenator/seven

Install systemd-resolved on RedHat 7
voxpupuli · Feb 21, 2022 · f24b7ac · f24b7ac
2 parents 0c86202 + 3c32c31
commit f24b7ac
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -306,7 +306,7 @@ class{'systemd':
 }
 ```
 
-when `manage_systemd` is true any required sub package, e.g. `systemd-resolved` on CentOS 8, will be installed. However configuration of
+when `manage_systemd` is true any required sub package, e.g. `systemd-resolved` on CentOS 9, will be installed. However configuration of
 systemd-resolved will only occur on second puppet run after that installation.
 
 This requires [puppetlabs-inifile](https://forge.puppet.com/puppetlabs/inifile), which is only a soft dependency in this module (you need to explicitly install it). Both parameters accept a string or an array.

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

diff --git a/spec/acceptance/resolved_spec.rb b/spec/acceptance/resolved_spec.rb
@@ -12,13 +12,12 @@
       }
       PUPPET
       apply_manifest(pp, catch_failures: true)
-      # RedHat 9 and newer installs package first run before fact  $facts['internal_services'] is set
-      apply_manifest(pp, catch_failures: true) if Gem::Version.new(fact('os.release.major')) >= Gem::Version.new('9') && (fact('os.family') == 'RedHat')
+      # RedHat 7, 9 and newer installs package first run before fact $facts['internal_services'] is set
+      apply_manifest(pp, catch_failures: true) if fact('os.release.major') != '8' && (fact('os.family') == 'RedHat')
       apply_manifest(pp, catch_changes: true)
     end
 
-    # RedHat 7 does not have systemd-resolved available at all.
-    describe service('systemd-resolved'), unless: (fact('os.release.major') == '7' and fact('os.family') == 'RedHat') do
+    describe service('systemd-resolved') do
       it { is_expected.to be_running }
       it { is_expected.to be_enabled }
     end
@@ -34,8 +33,6 @@
       }
       PUPPET
       apply_manifest(pp, catch_failures: true)
-      # RedHat 9 and newer installs package first run before fact  $facts['internal_services'] is set
-      apply_manifest(pp, catch_failures: true) if Gem::Version.new(fact('os.release.major')) >= Gem::Version.new('9') && (fact('os.family') == 'RedHat')
       apply_manifest(pp, catch_changes: true)
     end
 

diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -36,7 +36,7 @@
           it { is_expected.not_to contain_file('/etc/systemd/network') }
 
           case [facts[:os]['family'], facts[:os]['release']['major']]
-          when %w[RedHat 9]
+          when %w[RedHat 7], %w[RedHat 9]
             it { is_expected.to contain_package('systemd-resolved') }
           else
             it { is_expected.not_to contain_package('systemd-resolved') }