From 3ed891c470c6a84e2ef1b6141243fbd975b4dd7d Mon Sep 17 00:00:00 2001 From: Isaac Beckman Date: Wed, 30 Dec 2015 13:40:54 +0200 Subject: [PATCH] Dynamically schedule for updatepuppet master cron job Add an option to dynamically set the time interval for "updatepuppetmaster" cron job. This will enable to tune the update time interval differentially for different puppet masters, in different environments, rather than setting them all to 15 min hardcoded. Change-Id: Ib71bbb2ff6be1576a45d6809beb1164c79328a60 --- modules/openstack_project/manifests/puppetmaster.pp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp index 0cf515ef6d..27b760909c 100644 --- a/modules/openstack_project/manifests/puppetmaster.pp +++ b/modules/openstack_project/manifests/puppetmaster.pp @@ -7,6 +7,12 @@ class openstack_project::puppetmaster ( $root_rsa_key = 'xxx', $puppetdb = true, $puppetdb_server = 'puppetdb.openstack.org', + $puppetmaster_update_cron_interval = { min => '*/15', + hour => '*', + day => '*', + month => '*', + weekday => '*', + }, ) { include logrotate include openstack_project::params @@ -25,7 +31,11 @@ class openstack_project::puppetmaster ( cron { 'updatepuppetmaster': user => 'root', - minute => '*/15', + minute => $puppetmaster_update_cron_interval[min], + hour => $puppetmaster_update_cron_interval[hour], + monthday => $puppetmaster_update_cron_interval[day], + month => $puppetmaster_update_cron_interval[month], + weekday => $puppetmaster_update_cron_interval[weekday], command => 'flock -n /var/run/puppet/puppet_run_all.lock bash /opt/system-config/production/run_all.sh', environment => 'PATH=/var/lib/gems/1.8/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin', }