Backport voxpupuli#883: Allow custom location for slave JAVA command

hlaf · Sep 14, 2018 · 1d2d437 · 1d2d437
1 parent 89cff0a
commit 1d2d437
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/manifests/slave.pp b/manifests/slave.pp
@@ -79,6 +79,9 @@
 #   parameter so the `::jenkins` class does not need to be the catalog for
 #   slave only nodes.
 #
+# [*java_cmd*]
+#   Path to the java command in ${defaults_location}/jenkins-slave. Defaults to '/usr/bin/java'
+#
 
 # === Examples
 #
@@ -119,6 +122,7 @@
   $source                   = undef,
   $java_args                = undef,
   $proxy_server             = undef,
+  $java_cmd                 = '/usr/bin/java',
 ) inherits jenkins::params {
   validate_string($slave_name)
   validate_string($description)

diff --git a/templates/jenkins-slave-defaults.erb b/templates/jenkins-slave-defaults.erb
@@ -4,7 +4,7 @@
 NAME=jenkins-slave
 
 # location of java
-JAVA=/usr/bin/java
+JAVA=<%= @java_cmd %>
 
 # arguments to pass to java
 #JAVA_ARGS="-Xmx256m"