From 20517956da8c251f94d5f630542e3a8cd86f492a Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 25 Aug 2011 12:11:29 -0700 Subject: [PATCH] Revert "Add a mutex around puppet runs." This reverts commit 352cdce842c6e2f16d91ddecf99b834acbdd8ac6. Cron spam. Change-Id: Iea4bdbf0b2ec36185c58318e3b46847ce7ed3b56 Reviewed-on: https://review.openstack.org/347 Reviewed-by: James E. Blair Tested-by: Jenkins --- manifests/site.pp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 22c15d5c2f..fe0c2f8e9b 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -26,15 +26,13 @@ class openstack_base { "bzr", "git", "python-setuptools", - "util-linux", "byobu"] package { $packages: ensure => "latest" } cron { "updatepuppet": user => root, 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', - require => Package['util-linux'], + 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', } }