Merge pull request #146 from m0dular/SUP-2682-timer-template

(SUP-2682) Remove Requires= property from timers

Author: jarretlavallee

spec/acceptance/pe_system_spec.rb

@@ -46,12 +46,6 @@
       expect(apply_manifest(pp).exit_code).not_to eq(1)
     end
 
-    it 'system puppet_* metric services should be active or inactive' do
-      run_shell('systemctl list-units --type=service | grep "puppet_system.*metrics"') do |r|
-        expect(r.stdout).to match(%r{activ})
-      end
-    end
-
     context 'system timers are running' do
       it { expect(service('puppet_system_cpu-metrics.timer')).to be_running }
       it { expect(service('puppet_system_cpu-tidy.timer')).to be_running }
@@ -82,12 +76,6 @@ class { 'puppet_metrics_collector::system':
       expect(package('sysstat')).to be_installed
     end
 
-    it 'system puppet_* metric services should be active or inactive' do
-      run_shell('systemctl list-units --type=service | grep "puppet_system.*metrics"') do |r|
-        expect(r.stdout).to match(%r{activ})
-      end
-    end
-
     context 'system timers are running' do
       it { expect(service('puppet_system_cpu-metrics.timer')).to be_running }
       it { expect(service('puppet_system_cpu-tidy.timer')).to be_running }

templates/tidy_timer.epp

@@ -1,7 +1,6 @@
 <%- | String $service | -%>
 [Unit]
 Description=Timer to tidy Puppet metrics
-Requires=<%= $service %>-tidy.service
 
 [Timer]
 OnCalendar=*-*-* 00:00:00

templates/timer.epp

@@ -1,7 +1,6 @@
 <%- | String $service, String $minute | -%>
 [Unit]
 Description=Timer to collect Puppet metrics
-Requires=<%= $service %>-metrics.service
 
 [Timer]
 OnCalendar=*-*-* *:<%= $minute %>