Add systemd_randomizeddelaysec

Allow configuration of the RandomizedDelaySec parameter of the systemd
timer, which allows randomizing Puppet runs in a way that lets the
administrator see exact moment of the next Puppet run. There's no
incompatibility between Puppet's internal splay and this, but both
probably shouldn't be used together.

manifests/agent/service/systemd.pp

@@ -18,6 +18,8 @@
           default => $::puppet::systemd_cmd,
         }
 
+        $randomizeddelaysec = $::puppet::systemd_randomizeddelaysec
+
         file { "/etc/systemd/system/${::puppet::systemd_unit_name}.timer":
           content => template('puppet/agent/systemd.puppet-run.timer.erb'),
           notify  => [

manifests/init.pp

@@ -78,6 +78,10 @@
 # $systemd_cmd::                            Specify command to launch when runmode is
 #                                           set 'systemd.timer'.
 #
+# $systemd_randomizeddelaysec::             Adds a random delay between 0 and this value
+#                                           (in seconds) to the timer. Only relevant when
+#                                           runmode is 'systemd.timer'.
+#
 # $show_diff::                              Show and report changed files with diff output
 #
 # $module_repository::                      Use a different puppet module repository
@@ -582,6 +586,7 @@
   Array[Enum['cron', 'service', 'systemd.timer', 'none']] $unavailable_runmodes = $puppet::params::unavailable_runmodes,
   Optional[String] $cron_cmd = $puppet::params::cron_cmd,
   Optional[String] $systemd_cmd = $puppet::params::systemd_cmd,
+  Integer[0] $systemd_randomizeddelaysec = $puppet::params::systemd_randomizeddelaysec,
   Boolean $agent_noop = $puppet::params::agent_noop,
   Boolean $show_diff = $puppet::params::show_diff,
   Optional[Stdlib::HTTPUrl] $module_repository = $puppet::params::module_repository,

manifests/params.pp

@@ -53,6 +53,8 @@
   $aio_package      = ($::osfamily == 'Windows' or $::rubysitedir =~ /\/opt\/puppetlabs\/puppet/)
   $deb_naio_package = ($::osfamily == 'Debian')
 
+  $systemd_randomizeddelaysec = 0
+
   case $::osfamily {
     'Windows' : {
       # Windows prefixes normal paths with the Data Directory's path and leaves 'puppet' off the end

spec/classes/puppet_agent_service_systemd_spec.rb

@@ -68,6 +68,9 @@
             should contain_file('/etc/systemd/system/puppet-run.timer').
               with_content(/.*OnCalendar\=\*-\*-\* \*\:10,40:00.*/)
 
+            should contain_file('/etc/systemd/system/puppet-run.timer').
+              with_content(/^RandomizedDelaySec\=0$/)
+
             should contain_file('/etc/systemd/system/puppet-run.service').
               with_content(/.*ExecStart=#{bindir}\/puppet agent --config #{confdir}\/puppet.conf --onetime --no-daemonize.*/)
 

templates/agent/systemd.puppet-run.timer.erb

@@ -4,6 +4,7 @@ Description=Systemd Timer for Puppet Agent
 [Timer]
 OnCalendar=*-*-* <%= Array(@times[0]).join(',') %>:<%= Array(@times[1]).join(',') %>:00
 Persistent=true
+RandomizedDelaySec=<%= @randomizeddelaysec %>
 
 [Install]
 WantedBy=timers.target