opendev/system-config
Code Issues Proposed changes

Use flock around puppet_run_all script

Browse Source 
The ansible triggered puppet runs in the puppet_run_all script can force
the script to take longer than 15 minutes if there is much work to do.
This means puppet runs can overlap since the cron executes every 15
minutes. Avoid this overlap if things take a long time with a lock file
enforced by flock.

Change-Id: Ib2680ae3d2641dba7262d09d05a8bcd105b2bb43
This commit is contained in:
Clark Boylan 2015-01-30 12:01:30 -08:00
parent a27aef70dc
commit c28b0e1c31
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openstack_project/manifests/puppetmaster.pp
View File

@ -51,7 +51,7 @@ class openstack_project::puppetmaster (
cron { 'updatepuppetmaster': cron { 'updatepuppetmaster':
user => 'root', user => 'root',
minute => '*/15', minute => '*/15',
command => 'bash /opt/system-config/production/run_all.sh', 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', environment => 'PATH=/var/lib/gems/1.8/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin',
} }