Remove 'jvm.options' template, instead append to shipped file.

This removes the templated 'jvm.options' file, instead we append to the
shipped 'jvm.options' file by using the `file_line` resource.

Removed associated tests and template file.
Add additional tests to cover specifying 'jvm_options'.

Author: Gavin Williams

manifests/config.pp

@@ -243,12 +243,14 @@
       mode     => '0440',
     }
 
-    # Configure JVM options
-    file { "${::elasticsearch::configdir}/jvm.options":
-      content => template("${module_name}/etc/elasticsearch/jvm.options.erb"),
-      group   => $::elasticsearch::elasticsearch_group,
-      notify  => $::elasticsearch::_notify_service,
-      owner   => $::elasticsearch::elasticsearch_user,
+    # Add any additional JVM options
+    $elasticsearch::jvm_options.each |String $jvm_option| {
+      file_line { "jvm_option_${jvm_option}":
+        ensure => present,
+        path   => "${elasticsearch::configdir}/jvm.options",
+        line   => $jvm_option,
+        notify => $::elasticsearch::_notify_service,
+      }
     }
 
     if $::elasticsearch::system_key != undef {

spec/classes/000_elasticsearch_init_spec.rb

@@ -339,6 +339,52 @@
           .with(:owner => 'myesuser') if facts[:os]['family'] == 'RedHat' }
       end
 
+      describe 'setting jvm_options' do
+        jvm_options = [
+          '-Xms16g',
+          '-Xmx16g'
+        ]
+
+        let(:params) do
+          default_params.merge(
+            :jvm_options => jvm_options
+          )
+        end
+
+        jvm_options.each do |jvm_option|
+          it { should contain_file_line("jvm_option_#{jvm_option}")
+            .with(
+              :ensure => 'present',
+              :path   => '/etc/elasticsearch/jvm.options',
+              :line   => jvm_option
+            )}
+        end
+      end
+
+      context 'with restart_on_change => true' do
+        let(:params) do
+          default_params.merge(
+            :restart_on_change => true
+          )
+        end
+
+        describe 'should restart elasticsearch' do
+          it { should contain_file('/etc/elasticsearch/elasticsearch.yml')
+            .that_notifies('Service[elasticsearch]')}
+        end
+
+        describe 'setting jvm_options triggers restart' do
+          let(:params) do
+            super().merge(
+              :jvm_options => ['-Xmx16g']
+            )
+          end
+
+          it { should contain_file_line('jvm_option_-Xmx16g')
+            .that_notifies('Service[elasticsearch]')}
+        end
+      end
+
       # This check helps catch dependency cycles.
       context 'create_resource' do
         # Helper for these tests

spec/classes/001_hiera_spec.rb

@@ -58,7 +58,7 @@
             :enable => true
           ) }
 
-          %w[elasticsearch.yml jvm.options log4j2.properties].each do |file|
+          %w[elasticsearch.yml log4j2.properties].each do |file|
             it { should contain_file("/etc/elasticsearch/#{file}") }
           end
         end # of config

spec/helpers/class_shared_examples.rb

@@ -5,7 +5,7 @@
   it { should contain_datacat_fragment('main_config') }
   it { should contain_service('elasticsearch') }
 
-  %w[elasticsearch.yml jvm.options log4j2.properties].each do |file|
+  %w[elasticsearch.yml log4j2.properties].each do |file|
     it { should contain_file("/etc/elasticsearch/#{file}") }
   end