From 566e936d981160e0b7419c9a05cb4ac213462a44 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Fri, 18 Apr 2014 11:35:46 -0700
Subject: [PATCH] Stop trying to start gerrit every time

We only want to start it when we've installed or upgraded.
The initial-init and init are designed to either one of them run,
one if there is no init script (initial install) the other if there
is (upgrade). The things they trigger should only run in response
to those actions.

Change-Id: I3bcaaed07bcf6239e053789b9b6241cbf652e7d4
---
 modules/gerrit/manifests/init.pp | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index a4ae064479..700f58ff4e 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -509,16 +509,18 @@ class gerrit(
 
   # If gerrit.war was just installed, run the Gerrit "init" command.
   exec { 'gerrit-initial-init':
-    user      => 'gerrit2',
-    command   => '/usr/bin/java -jar /home/gerrit2/review_site/bin/gerrit.war init -d /home/gerrit2/review_site --batch --no-auto-start',
-    subscribe => File['/home/gerrit2/review_site/bin/gerrit.war'],
-    require   => [Package['openjdk-7-jre-headless'],
-                  User['gerrit2'],
-                  Mysql::Db['reviewdb'],
-                  File['/home/gerrit2/review_site/etc/gerrit.config'],
-                  File['/home/gerrit2/review_site/etc/secure.config']],
-    notify    => Exec['install-core-plugins'],
-    logoutput => true,
+    user        => 'gerrit2',
+    command     => '/usr/bin/java -jar /home/gerrit2/review_site/bin/gerrit.war init -d /home/gerrit2/review_site --batch --no-auto-start',
+    subscribe   => File['/home/gerrit2/review_site/bin/gerrit.war'],
+    refreshonly => true,
+    require     => [Package['openjdk-7-jre-headless'],
+                    User['gerrit2'],
+                    Mysql::Db['reviewdb'],
+                    File['/home/gerrit2/review_site/etc/gerrit.config'],
+                    File['/home/gerrit2/review_site/etc/secure.config']],
+    notify      => Exec['install-core-plugins'],
+    unless      => '/usr/bin/test -f /etc/init.d/gerrit',
+    logoutput   => true,
   }
 
   # If a new gerrit.war was just installed, run the Gerrit "init" command.
@@ -536,6 +538,7 @@ class gerrit(
                     File['/home/gerrit2/review_site/etc/gerrit.config'],
                     File['/home/gerrit2/review_site/etc/secure.config']],
     notify      => Exec['install-core-plugins'],
+    onlyif      => '/usr/bin/test -f /etc/init.d/gerrit',
     logoutput   => true,
   }
 
@@ -547,7 +550,7 @@ class gerrit(
     require     => [Package['unzip'],
                     File['/home/gerrit2/review_site/plugins']],
     notify      => Exec['gerrit-start'],
-    unless      => '/usr/bin/test -f /etc/init.d/gerrit',
+    refreshonly => true,
     logoutput   => true,
   }