Consume jeepyb.

Instead of keeping many of these files directly in the tree, use them
from the out-of-tree jeepyb project, which makes them easier to consume
for other people who are not us.

Change-Id: Id704f2e17dd80709ef63cbbf2c5475a08a835f91
Reviewed-on: https://review.openstack.org/16777
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins

modules/gerrit/manifests/cron.pp

@@ -9,8 +9,8 @@ class gerrit::cron(
     user    => 'gerrit2',
     hour    => '6',
     minute  => '3',
-    command => "python /usr/local/gerrit/scripts/expire_old_reviews.py ${script_user} ${script_key_file}",
-    require => File['/usr/local/gerrit/scripts'],
+    command => "python /usr/local/bin/expire-old-reviews ${script_user} ${script_key_file}",
+    require => Class['jeepyb'],
   }
 
   cron { 'gerrit_repack':

modules/gerrit/manifests/init.pp

@@ -111,6 +111,7 @@ class gerrit(
   $testmode = false
 ) {
   include apache
+  include jeepyb
   include pip
 
   $java_home = $::lsbdistcodename ? {
@@ -490,13 +491,7 @@ class gerrit(
   }
 
   file { '/usr/local/gerrit/scripts':
-    ensure  => directory,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0755',
-    recurse => true,
-    require => File['/usr/local/gerrit'],
-    source  => 'puppet:///modules/gerrit/scripts',
+    ensure  => absent,
   }
 
   # Install Bouncy Castle's OpenPGP plugin and populate the contact store

modules/gerrit/manifests/remotes.pp

@@ -5,8 +5,8 @@ class gerrit::remotes($ensure=present) {
       ensure  => $ensure,
       user    => 'gerrit2',
       minute  => '*/30',
-      command => 'sleep $((RANDOM\%60+90)) && python /usr/local/gerrit/scripts/fetch_remotes.py',
-      require => File['/usr/local/gerrit/scripts'],
+      command => 'sleep $((RANDOM\%60+90)) && /usr/local/bin/fetch-remotes',
+      require => Class['jeepyb'],
     }
 
     file { '/home/gerrit2/remotes.config':