Plucas has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162152
Change subject: Add java_opts option
......................................................................
Add java_opts option
Change-Id: I8dc008c791c8cda730c396069d506fcdb0d7b79b
---
M manifests/defaults.pp
M manifests/server.pp
M templates/kafka.default.erb
3 files changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/kafka
refs/changes/52/162152/1
diff --git a/manifests/defaults.pp b/manifests/defaults.pp
index dfadbc8..f8b684a 100644
--- a/manifests/defaults.pp
+++ b/manifests/defaults.pp
@@ -28,6 +28,7 @@
# Broker Server settings
$java_home = undef
+ $java_opts = undef
$jmx_port = 9999
$log_dirs = ['/var/spool/kafka']
$heap_opts = undef
diff --git a/manifests/server.pp b/manifests/server.pp
index 7419d64..8a7ed59 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -34,6 +34,8 @@
#
# $java_home - Value for the JAVA_HOME environment
variable. Default: undef
#
+# $java_opts - Extra Java options. Default: undef.
+#
# $jmx_port - Port on which to expose JMX metrics.
Default: 9999
#
# $heap_opts - Heap options to pass to JVM on
startup. Default: undef
@@ -132,6 +134,7 @@
$zookeeper_chroot = $kafka::defaults::zookeeper_chroot,
$java_home = $kafka::defaults::java_home,
+ $java_opts = $kafka::defaults::java_opts,
$jmx_port = $kafka::defaults::jmx_port,
$heap_opts = $kafka::defaults::heap_opts,
$nofiles_ulimit = $kafka::defaults::nofiles_ulimit,
diff --git a/templates/kafka.default.erb b/templates/kafka.default.erb
index a83838e..56bd507 100644
--- a/templates/kafka.default.erb
+++ b/templates/kafka.default.erb
@@ -12,6 +12,13 @@
JAVA_HOME="<%= @java_home %>"
<% end -%>
+# Extra Java options
+<% if @java_opts -%>
+JAVA_OPTS="<%= @java_opts %>"
+<% else -%>
+#JAVA_OPTS=""
+<% end -%>
+
KAFKA_NOFILES_ULIMIT=<%= @nofiles_ulimit %>
# The default JMX_PORT for Kafka Brokers is 9999.
--
To view, visit https://gerrit.wikimedia.org/r/162152
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8dc008c791c8cda730c396069d506fcdb0d7b79b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/kafka
Gerrit-Branch: master
Gerrit-Owner: Plucas <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
