From 0d716c1fe1830b47a44541cd0db35248cb52cd87 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <james.blair@rackspace.com>
Date: Mon, 15 Aug 2011 14:01:28 -0700
Subject: [PATCH] Move puppet cron job to global server config.

Remove jenkins user dependency from updatepuppet job.
Add sleep to the beginning of the cron job so that not all
openstack servers hit the git repo and run puppet at once.

Change-Id: Ic5ac6e2a79e1af53e3abb4ca40bea5d03a1cd32c
Reviewed-on: https://review.openstack.org/241
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
---
 manifests/site.pp                       | 6 ++++++
 modules/jenkins_slave/manifests/init.pp | 7 -------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 673a6c0039..c6362e1f9d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -27,6 +27,12 @@ class openstack_base {
                "python-setuptools",
                "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 && /var/lib/gems/1.8/bin/puppet apply -l /tmp/manifest.log --modulepath=/root/openstack-ci-puppet/modules manifests/site.pp",
+  }
 }
 
 class openstack_server {
diff --git a/modules/jenkins_slave/manifests/init.pp b/modules/jenkins_slave/manifests/init.pp
index c83d9eaf0e..a01dd3b8e3 100644
--- a/modules/jenkins_slave/manifests/init.pp
+++ b/modules/jenkins_slave/manifests/init.pp
@@ -13,13 +13,6 @@ class jenkins_slave {
       ensure => present,
     }
 
-    cron { "updatepuppet":
-      user => root,
-      minute => "*/15",
-      command => "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 => [ Jenkinsuser[jenkins] ]
-    }
-
     cron { "updateci":
       user => jenkins,
       minute => "*/15",