Merge pull request #724 from /issues/688

remove code for puppet < 7
voxpupuli · May 18, 2024 · 44e45dd · 44e45dd
2 parents aff27e1 + a0f13f0
commit 44e45dd
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 14 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -221,11 +221,6 @@
           }),
           notify  => $notify,
         }
-        if versioncmp($facts['puppetversion'],'6.1.0') < 0 {
-          # Puppet 5 doesn't have https://tickets.puppetlabs.com/browse/PUP-3483
-          # and camptocamp/systemd only creates this relationship when managing the service
-          Class['systemd::systemctl::daemon_reload'] -> Class['prometheus::run_service']
-        }
       }
       'sysv', 'sles': {
         file { "/etc/init.d/${prometheus::server::service_name}":

diff --git a/spec/defines/daemon_spec.rb b/spec/defines/daemon_spec.rb
@@ -106,8 +106,6 @@
             )
           }
 
-          it { is_expected.to contain_class('systemd::systemctl::daemon_reload').that_comes_before('Service[smurf_exporter]') } if Gem::Version.new(facts[:puppetversion]) < Gem::Version.new('6.1.0')
-
           context 'with overidden bin_name' do
             let(:params) do
               super().merge(bin_name: 'notsmurf_exporter')

diff --git a/spec/setup_acceptance_node.pp b/spec/setup_acceptance_node.pp
@@ -1,10 +1,3 @@
-# Needed for os.distro.codebase fact on ubuntu 16/18 on puppet 6
-if $facts['os']['name'] == 'Ubuntu' and versioncmp($facts['puppetversion'], '7.0.0') < 0 {
-  package{'lsb-release':
-    ensure => present,
-  }
-}
-
 file_line { '/etc/hosts-squid':
   path => '/etc/hosts',
   line => "${facts['squid_ip']} squid",