Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/302840

Change subject: Fix 'reindex_gerrit_jetty': Since we need run init before 
reindex
......................................................................

Fix 'reindex_gerrit_jetty': Since we need run init before reindex

Otherwise it will fail because it is missing projects in review_site/git/

Change-Id: Ia27002cd7f250630d9685d9cc6a7356dd22808a5
---
M modules/gerrit/manifests/jetty.pp
1 file changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/40/302840/2

diff --git a/modules/gerrit/manifests/jetty.pp 
b/modules/gerrit/manifests/jetty.pp
index 8b0e633..6e7b129 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -118,6 +118,14 @@
         source  => 'puppet:///modules/gerrit/static',
     }
 
+    exec { 'reindex_gerrit_jetty':
+        creates => '/var/lib/gerrit2/review_site/index',
+        user    => 'gerrit2',
+        group   => 'gerrit2',
+        cwd     => '/var/lib/gerrit2',
+        command => '/usr/bin/java -jar gerrit.war reindex -d review_site 
--threads 4',
+    }
+
     exec { 'install_gerrit_jetty':
         creates => '/var/lib/gerrit2/review_site/bin',
         user    => 'gerrit2',
@@ -127,6 +135,7 @@
         require => [
             File['/var/lib/gerrit2/review_site/etc/gerrit.config'],
             File['/var/lib/gerrit2/review_site/etc/secure.config'],
+            Exec['reindex_gerrit_jetty'],
         ],
     }
 
@@ -146,7 +155,7 @@
         enable    => true,
         hasstatus => false,
         status    => '/etc/init.d/gerrit check',
-        require   => Exec['reindex_gerrit_jetty'],
+        require   => Exec['reindex_gerrit_jetty install_gerrit_jetty'],
     }
 
     file { '/etc/default/gerritcodereview':

-- 
To view, visit https://gerrit.wikimedia.org/r/302840
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia27002cd7f250630d9685d9cc6a7356dd22808a5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to