Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/384760 )

Change subject: Also use scap-deployed version of gerrit.war for actual running 
of gerrit
......................................................................

Also use scap-deployed version of gerrit.war for actual running of gerrit

We already install the one in review_site (which we probably don't need
anymore either), but it required us to explicitly run `init` prior to
upgrading the in place one

Change-Id: I044b67a67370869182bcd9f8f6858cb11b728da7
---
M modules/gerrit/manifests/jetty.pp
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/60/384760/1

diff --git a/modules/gerrit/manifests/jetty.pp 
b/modules/gerrit/manifests/jetty.pp
index 8927fff..2d9712e 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -110,6 +110,11 @@
       target  => '/srv/deployment/gerrit/gerrit/gerrit.war',
       require => [File['/var/lib/gerrit2'], Scap::Target['gerrit/gerrit']],
     }
+    file { '/var/lib/gerrit2/review_site/gerrit.war':
+      ensure  => 'link',
+      target  => '/srv/deployment/gerrit/gerrit/gerrit.war',
+      require => [File['/var/lib/gerrit2/review_site'], 
Scap::Target['gerrit/gerrit']],
+    }
 
     file { '/var/lib/gerrit2/.gitconfig':
         ensure  => directory,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I044b67a67370869182bcd9f8f6858cb11b728da7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <ch...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to