diff --git a/manifests/agent/service/cron.pp b/manifests/agent/service/cron.pp index f908c1a..b790cd3 100644 --- a/manifests/agent/service/cron.pp +++ b/manifests/agent/service/cron.pp @@ -1,20 +1,20 @@ class puppet::agent::service::cron ( Boolean $enabled = false, ) { unless 'cron' in $::puppet::unavailable_runmodes { if $enabled { $command = pick($::puppet::cron_cmd, "${::puppet::puppet_cmd} agent --config ${::puppet::dir}/puppet.conf --onetime --no-daemonize") - $times = ip_to_cron($::puppet::runinterval) + $times = extlib::ip_to_cron($::puppet::runinterval) cron { 'puppet': command => $command, user => root, hour => $times[0], minute => $times[1], } } else{ cron { 'puppet': ensure => absent, } } } } diff --git a/manifests/agent/service/systemd.pp b/manifests/agent/service/systemd.pp index ec61d37..24eec86 100644 --- a/manifests/agent/service/systemd.pp +++ b/manifests/agent/service/systemd.pp @@ -1,66 +1,66 @@ class puppet::agent::service::systemd ( Boolean $enabled = false, ) { unless 'systemd.timer' in $::puppet::unavailable_runmodes { exec { 'systemctl-daemon-reload-puppet': refreshonly => true, path => $::path, command => 'systemctl daemon-reload', } if $enabled { # Use the same times as for cron - $times = ip_to_cron($::puppet::runinterval) + $times = extlib::ip_to_cron($::puppet::runinterval) $command = $::puppet::systemd_cmd ? { undef => "${::puppet::puppet_cmd} agent --config ${::puppet::dir}/puppet.conf --onetime --no-daemonize --detailed-exitcode --no-usecacheonfailure", 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 => [ Exec['systemctl-daemon-reload-puppet'], Service['puppet-run.timer'], ], } file { "/etc/systemd/system/${::puppet::systemd_unit_name}.service": content => template('puppet/agent/systemd.puppet-run.service.erb'), notify => Exec['systemctl-daemon-reload-puppet'], } service { 'puppet-run.timer': ensure => running, provider => 'systemd', name => "${::puppet::systemd_unit_name}.timer", enable => true, require => Exec['systemctl-daemon-reload-puppet'], } } else { # Reverse order - stop, delete files, exec service { 'puppet-run.timer': ensure => stopped, provider => 'systemd', name => "${::puppet::systemd_unit_name}.timer", enable => false, before => [ File["/etc/systemd/system/${::puppet::systemd_unit_name}.timer"], File["/etc/systemd/system/${::puppet::systemd_unit_name}.service"], ], } file { "/etc/systemd/system/${::puppet::systemd_unit_name}.timer": ensure => absent, notify => Exec['systemctl-daemon-reload-puppet'], } file { "/etc/systemd/system/${::puppet::systemd_unit_name}.service": ensure => absent, notify => Exec['systemctl-daemon-reload-puppet'], } } } } diff --git a/metadata.json b/metadata.json index ca8a925..ff6a9d1 100644 --- a/metadata.json +++ b/metadata.json @@ -1,118 +1,118 @@ { "name": "theforeman-puppet", "version": "10.1.1", "author": "theforeman", "summary": "Puppet agent and server configuration", "license": "GPL-3.0+", "source": "git://github.com/theforeman/puppet-puppet", "project_page": "https://github.com/theforeman/puppet-puppet", "issues_url": "https://github.com/theforeman/puppet-puppet/issues", "description": "Module for installing the Puppet agent and Puppet server", "tags": [ "foreman", "puppet", "puppetmaster", "puppet-server" ], "dependencies": [ { "name": "puppetlabs/apache", "version_requirement": ">= 1.2.0 < 4.0.0" }, { "name": "puppetlabs/concat", "version_requirement": ">= 1.0.0 < 6.0.0" }, { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.13.0 < 6.0.0" }, { "name": "puppet/extlib", - "version_requirement": ">= 0.11.3 < 4.0.0" + "version_requirement": ">= 3.0.0 < 4.0.0" } ], "requirements": [ { "name": "puppet", "version_requirement": ">= 4.6.1 < 7.0.0" } ], "operatingsystem_support": [ { "operatingsystem": "RedHat", "operatingsystemrelease": [ "6", "7" ] }, { "operatingsystem": "CentOS", "operatingsystemrelease": [ "6", "7" ] }, { "operatingsystem": "Scientific", "operatingsystemrelease": [ "6", "7" ] }, { "operatingsystem": "Fedora", "operatingsystemrelease": [ "26" ] }, { "operatingsystem": "Debian", "operatingsystemrelease": [ "8", "9" ] }, { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ "14.04", "16.04", "18.04" ] }, { "operatingsystem": "FreeBSD", "operatingsystemrelease": [ "10", "11" ] }, { "operatingsystem": "DragonFly", "operatingsystemrelease": [ "4" ] }, { "operatingsystem": "Archlinux" }, { "operatingsystem": "SLES", "operatingsystemrelease": [ "11", "12" ] }, { "operatingsystem": "windows", "operatingsystemrelease": [ "7", "8", "2008 R2", "2012", "2012 R2" ] } ] }