Merge pull request voxpupuli#485 from covermymeds/slave_java_args

add ability to set java_args on slaves

manifests/slave.pp

@@ -59,6 +59,19 @@
 #
 # [*manage_client_jar*]
 #   Should the class download the client jar file from the web? Defaults to true.
+#
+# [*ensure*]
+#   Service ensure control for jenkins-slave service. Default running
+#
+# [*enable*]
+#   Service enable control for jenkins-slave service. Default true.
+#
+# [*source*]
+#   File source for jenkins slave jar. Default pulls from http://maven.jenkins-ci.org
+#
+# [*java_args*]
+#   Java arguments to add to slave command line. Allows configuration of heap, etc.
+#
 
 # === Examples
 #
@@ -97,9 +110,13 @@
   $ensure                   = 'running',
   $enable                   = true,
   $source                   = undef,
+  $java_args                = undef,
 ) inherits jenkins::params {
 
   validate_string($tool_locations)
+  if $java_args {
+    validate_string($java_args)
+  }
 
   $client_jar = "swarm-client-${version}-jar-with-dependencies.jar"
   $client_url = $source ? {

spec/classes/jenkins_slave_spec.rb

@@ -63,6 +63,19 @@
         should contain_file(slave_runtime_file).with_content(/^JENKINS_PASSWORD="#{password}"$/)
       end
     end
+
+    describe 'with java_args' do
+      let(:args) { '-Xmx2g' }
+      let(:params) do
+        {
+          :java_args => args
+        }
+      end
+
+      it 'should set java_args' do
+        should contain_file(slave_runtime_file).with_content(/^JAVA_ARGS="#{args}"$/)
+      end
+    end
   end
 
   shared_examples 'using slave_name' do

templates/jenkins-slave-defaults.erb

@@ -9,6 +9,9 @@ JAVA=/usr/bin/java
 # arguments to pass to java
 #JAVA_ARGS="-Xmx256m"
 #JAVA_ARGS="-Djava.net.preferIPv4Stack=true" # make jenkins listen on IPv4 address
+<% if @java_args -%>
+JAVA_ARGS="<%= @java_args -%>"
+<% end -%>
 
 PIDFILE=/var/run/jenkins-slave/jenkins-slave.pid