[MediaWiki-commits] [Gerrit] Add option for extra classpath entries - change (operations...kafka)
Ottomata has submitted this change and it was merged. Change subject: Add option for extra classpath entries .. Add option for extra classpath entries Change-Id: I671527f349c8317e07b1a4ba67ee02d37d9913a4 --- M manifests/defaults.pp M manifests/server.pp M templates/kafka.default.erb 3 files changed, 12 insertions(+), 1 deletion(-) Approvals: Ottomata: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/defaults.pp b/manifests/defaults.pp index f8b684a..c64f1ad 100644 --- a/manifests/defaults.pp +++ b/manifests/defaults.pp @@ -29,6 +29,7 @@ # Broker Server settings $java_home = undef $java_opts = undef +$classpath = undef $jmx_port= $log_dirs= ['/var/spool/kafka'] $heap_opts = undef diff --git a/manifests/server.pp b/manifests/server.pp index 8a7ed59..57a1cc8 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -34,7 +34,9 @@ # # $java_home- Value for the JAVA_HOME environment variable. Default: undef # -# $java_opts- Extra Java options. Default: undef. +# $java_opts- Extra Java options. Default: undef +# +# $classpath- Extra classpath entries. Default: undef # # $jmx_port - Port on which to expose JMX metrics. Default: # @@ -135,6 +137,7 @@ $java_home = $kafka::defaults::java_home, $java_opts = $kafka::defaults::java_opts, +$classpath = $kafka::defaults::classpath, $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 56bd507..c13b29e 100644 --- a/templates/kafka.default.erb +++ b/templates/kafka.default.erb @@ -19,6 +19,13 @@ #JAVA_OPTS= % end -% +# Extra classpath entries +% if @classpath -% +CLASSPATH=%= @classpath % +% else -% +#CLASSPATH= +% end -% + KAFKA_NOFILES_ULIMIT=%= @nofiles_ulimit % # The default JMX_PORT for Kafka Brokers is . -- To view, visit https://gerrit.wikimedia.org/r/163890 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I671527f349c8317e07b1a4ba67ee02d37d9913a4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet/kafka Gerrit-Branch: master Gerrit-Owner: Plucas plu...@yelp.com Gerrit-Reviewer: Ottomata o...@wikimedia.org Gerrit-Reviewer: Plucas plu...@yelp.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add option for extra classpath entries - change (operations...kafka)
Plucas has uploaded a new change for review. https://gerrit.wikimedia.org/r/163890 Change subject: Add option for extra classpath entries .. Add option for extra classpath entries Change-Id: I671527f349c8317e07b1a4ba67ee02d37d9913a4 --- M manifests/defaults.pp M manifests/server.pp M templates/kafka.default.erb 3 files changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/kafka refs/changes/90/163890/1 diff --git a/manifests/defaults.pp b/manifests/defaults.pp index f8b684a..c64f1ad 100644 --- a/manifests/defaults.pp +++ b/manifests/defaults.pp @@ -29,6 +29,7 @@ # Broker Server settings $java_home = undef $java_opts = undef +$classpath = undef $jmx_port= $log_dirs= ['/var/spool/kafka'] $heap_opts = undef diff --git a/manifests/server.pp b/manifests/server.pp index 8a7ed59..57a1cc8 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -34,7 +34,9 @@ # # $java_home- Value for the JAVA_HOME environment variable. Default: undef # -# $java_opts- Extra Java options. Default: undef. +# $java_opts- Extra Java options. Default: undef +# +# $classpath- Extra classpath entries. Default: undef # # $jmx_port - Port on which to expose JMX metrics. Default: # @@ -135,6 +137,7 @@ $java_home = $kafka::defaults::java_home, $java_opts = $kafka::defaults::java_opts, +$classpath = $kafka::defaults::classpath, $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 56bd507..c13b29e 100644 --- a/templates/kafka.default.erb +++ b/templates/kafka.default.erb @@ -19,6 +19,13 @@ #JAVA_OPTS= % end -% +# Extra classpath entries +% if @classpath -% +CLASSPATH=%= @classpath % +% else -% +#CLASSPATH= +% end -% + KAFKA_NOFILES_ULIMIT=%= @nofiles_ulimit % # The default JMX_PORT for Kafka Brokers is . -- To view, visit https://gerrit.wikimedia.org/r/163890 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I671527f349c8317e07b1a4ba67ee02d37d9913a4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet/kafka Gerrit-Branch: master Gerrit-Owner: Plucas plu...@yelp.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
