Alexandros Kosiaris has submitted this change and it was merged.
Change subject: solr: qualify vars
......................................................................
solr: qualify vars
Change-Id: Iabd67ddc57a10433f7c222750fe8853603b0bbd8
---
M modules/solr/templates/jetty.erb
M modules/solr/templates/solrconfig.xml.erb
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
Dzahn: Looks good to me, but someone else must approve
diff --git a/modules/solr/templates/jetty.erb b/modules/solr/templates/jetty.erb
index fb85a97..b9e02ef 100644
--- a/modules/solr/templates/jetty.erb
+++ b/modules/solr/templates/jetty.erb
@@ -25,7 +25,7 @@
#JETTY_ARGS=
# Extra options to pass to the JVM
-JAVA_OPTIONS="-XX:+UseConcMarkSweepGC -Xmx<%= max_heap %> -Xms<%= max_heap %>"
+JAVA_OPTIONS="-XX:+UseConcMarkSweepGC -Xmx<%= @max_heap %> -Xms<%= @max_heap
%>"
# Home of Java installation.
#JAVA_HOME=
diff --git a/modules/solr/templates/solrconfig.xml.erb
b/modules/solr/templates/solrconfig.xml.erb
index 829d312..fba06b3 100644
--- a/modules/solr/templates/solrconfig.xml.erb
+++ b/modules/solr/templates/solrconfig.xml.erb
@@ -1047,7 +1047,7 @@
this is just a slave and remove the <lst name="slave"> section
if this is just a master.
-->
- <% if replication_master != :undef then -%>
+ <% if @replication_master != :undef then -%>
<requestHandler name="/replication" class="solr.ReplicationHandler" >
<% if @fqdn == replication_master then -%>
@@ -1061,7 +1061,7 @@
<% else -%>
<lst name="slave">
- <str name="masterUrl">http://<%= replication_master
%>:8983/solr/replication</str>
+ <str name="masterUrl">http://<%= @replication_master
%>:8983/solr/replication</str>
<str name="pollInterval">00:00:60</str>
</lst>
--
To view, visit https://gerrit.wikimedia.org/r/149960
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iabd67ddc57a10433f7c222750fe8853603b0bbd8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
