Fix gerrit entrypoint error
REINDEX_AT_STARTUP variable is used by the gerrit entrypoint to decide
whether to force a reindex.
This is only needed by master2 in the dual-master recipe, however the
variable should be still set to false for all other master installations
so that the entrypoint won't raise the following error:
/bin/entrypoint.sh: line 35: [: ==: unary operator expected
Bug: Issue 13703
Change-Id: I88ffdad29af5137bdb9a612642b5fe45f3b94204
diff --git a/master-slave/cf-service-master.yml b/master-slave/cf-service-master.yml
index f1e7e95..e4060f2 100644
--- a/master-slave/cf-service-master.yml
+++ b/master-slave/cf-service-master.yml
@@ -267,6 +267,8 @@
Value: !Ref SlaveSubdomain
- Name: HOSTED_ZONE_NAME
Value: !Ref HostedZoneName
+ - Name: REINDEX_AT_STARTUP
+ Value: false
- Name: METRICS_CLOUDWATCH_ENABLED
Value: !Ref MetricsCloudwatchEnabled
- Name: METRICS_CLOUDWATCH_NAMESPACE
diff --git a/single-master/cf-service.yml b/single-master/cf-service.yml
index fcfe842..7302e6a 100644
--- a/single-master/cf-service.yml
+++ b/single-master/cf-service.yml
@@ -213,6 +213,8 @@
Value: !Ref AWS::Region
- Name: GERRIT_KEY_PREFIX
Value: !Ref GerritKeyPrefix
+ - Name: REINDEX_AT_STARTUP
+ Value: false
- Name: GERRIT_HEAP_LIMIT
Value: !Ref GerritHeapLimit
- Name: JGIT_CACHE_SIZE
