diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index df7c2476d7..458f244586 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -73,6 +73,7 @@ class openstack_project::gerrit (
   $secondary_index = true,
   $report_bug_text = 'Get Help',
   $report_bug_url = 'http://docs.openstack.org/infra/system-config/project.html#contributing',
+  $index_threads = 1,
 ) {
 
   class { 'jeepyb::openstackwatch':
@@ -206,6 +207,7 @@ class openstack_project::gerrit (
     require                             => Class[openstack_project::server],
     report_bug_text                     => $report_bug_text,
     report_bug_url                      => $report_bug_url,
+    index_threads                       => $index_threads,
   }
 
   mysql_backup::backup_remote { 'gerrit':
diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp
index 47fcd18292..eb328838bc 100644
--- a/modules/openstack_project/manifests/review.pp
+++ b/modules/openstack_project/manifests/review.pp
@@ -112,6 +112,7 @@ class openstack_project::review (
     core_packedgitlimit                 => '400m',
     core_packedgitwindowsize            => '16k',
     sshd_threads                        => '100',
+    index_threads                       => 4,
     httpd_maxwait                       => '5000min',
     war                                 =>
       'http://tarballs.openstack.org/ci/gerrit/gerrit-v2.8.4.19.4548330.war',