opendev/system-config
Code Issues Proposed changes

Revert "Add a mutex around puppet runs."

Browse Source 
This reverts commit 352cdce842c6e2f16d91ddecf99b834acbdd8ac6.

Cron spam.

Change-Id: Iea4bdbf0b2ec36185c58318e3b46847ce7ed3b56
Reviewed-on: https://review.openstack.org/347
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
James E. Blair 2011-08-25 12:11:29 -07:00 committed by Jenkins
parent 325649a6e4
commit 20517956da
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/site.pp
View File

@ -26,15 +26,13 @@ class openstack_base {
"bzr", "bzr",
"git", "git",
"python-setuptools", "python-setuptools",
"util-linux",
"byobu"] "byobu"]
package { $packages: ensure => "latest" } package { $packages: ensure => "latest" }
cron { "updatepuppet": cron { "updatepuppet":
user => root, user => root,
minute => "*/15", minute => "*/15",
command => 'sleep $((RANDOM\%600)) && cd /root/openstack-ci-puppet && /usr/bin/git pull -q && /usr/bin/flock -x /var/run/puppet.lock -w 120 /var/lib/gems/1.8/bin/puppet apply -l /tmp/manifest.log --modulepath=/root/openstack-ci-puppet/modules manifests/site.pp', command => 'sleep $((RANDOM\%600)) && cd /root/openstack-ci-puppet && /usr/bin/git pull -q && /var/lib/gems/1.8/bin/puppet apply -l /tmp/manifest.log --modulepath=/root/openstack-ci-puppet/modules manifests/site.pp',
require => Package['util-linux'],
} }
} }