diff --git a/modules/gerrit/manifests/cron.pp b/modules/gerrit/manifests/cron.pp
new file mode 100644
index 0000000..05d82d8
--- /dev/null
+++ b/modules/gerrit/manifests/cron.pp
@@ -0,0 +1,31 @@
+class gerrit::cron(
+    $script_user,
+    $script_key_file
+    ) {
+
+    cron { "expireoldreviews":
+      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'],
+    }
+
+    cron { "gerrit_repack":
+      user => gerrit2,
+      weekday => 0,
+      hour => 4,
+      minute => 7,
+      command => 'find /home/gerrit2/review_site/git/ -type d -name "*.git" -print -exec git --git-dir="{}" repack -afd \;',
+      environment => "PATH=/usr/bin:/bin:/usr/sbin:/sbin",
+    }
+
+    cron { "removedbdumps":
+      user => gerrit2,
+      hour => 5,
+      minute => 1,
+      command => 'find /home/gerrit2/dbupdates/ -name "*.sql.gz" -mtime +30 -exec rm -f {} \;',
+      environment => "PATH=/usr/bin:/bin:/usr/sbin:/sbin",
+    }
+
+}
diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index 6660e0f..22b88f2 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -119,32 +119,6 @@ class gerrit($virtual_hostname='',
       require => File['/usr/local/gerrit/scripts'],
     }
 
-    cron { "expireoldreviews":
-      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'],
-    }
-
-    cron { "gerrit_repack":
-      user => gerrit2,
-      weekday => 0,
-      hour => 4,
-      minute => 7,
-      command => 'find /home/gerrit2/review_site/git/ -type d -name "*.git" -print -exec git --git-dir="{}" repack -afd \;',
-      environment => "PATH=/usr/bin:/bin:/usr/sbin:/sbin",
-    }
-
-    cron { "removedbdumps":
-      user => gerrit2,
-      hour => 5,
-      minute => 1,
-      command => 'find /home/gerrit2/dbupdates/ -name "*.sql.gz" -mtime +30 -exec rm -f {} \;',
-      environment => "PATH=/usr/bin:/bin:/usr/sbin:/sbin",
-    }
-
-
   } # testmode==false
 
   file { "/var/log/gerrit":
diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index a03f275..31903ed 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -67,6 +67,10 @@ class openstack_project::gerrit (
     mysql_password => $mysql_password,
     email_private_key => $email_private_key
   }
+  class { 'gerrit::cron':
+    script_user => $script_user,
+    script_key_file => $script_key_file,
+  }
   class { 'github':
     github_projects => $github_projects,
     github_user => $github_username,