Remove java opts in favour of es_jvm_options + allow max_map_count to be set. docs updated

README.md

@@ -331,11 +331,8 @@ Additional parameters to es_config allow the customization of the Java and Elast
 * ```es_allow_downgrades``` For development purposes only. (true or false (default) )
 * ```es_java_install``` If set to false, Java will not be installed. (true (default) or false)
 * ```update_java``` Updates Java to the latest version. (true or false (default))
-* ```es_java_opts``` an array of java options. E.g.:
-```yml
-es_java_opts:
-  - "-Djava.io.tmpdir=/data/tmp/elasticsearch"
-```
+* ```es_max_map_count``` maximum number of VMA (Virtual Memory Areas) a process can own. Default is undefined and not used.
+* ```es_max_open_files``` the maximum file descriptor number that can be opened by this process. Defaults to 65536.
 
 Earlier examples illustrate the installation of plugins using `es_plugins`.  For officially supported plugins no version or source delimiter is required. The plugin script will determine the appropriate plugin version based on the target Elasticsearch version.  For community based plugins include the full path e.g. "lmenezes/elasticsearch-kopf" and the appropriate version for the target version of Elasticsearch.  This approach should NOT be used for X-Pack related plugins e.g. Security.  See X-Pack below for details here.
  

templates/elasticsearch.j2

@@ -22,26 +22,7 @@ WORK_DIR={{work_dir}}
 # Elasticsearch PID directory
 PID_DIR={{pid_dir}}
 
-{% if es_version | version_compare('5.0', '<') %}
-# Heap size defaults to 256m min, 1g max
-# Set ES_HEAP_SIZE to 50% of available RAM, but no more than 31g
-{% if es_heap_size is defined %}
-ES_HEAP_SIZE={{es_heap_size}}
-{% endif %}
-{% endif %}
-
-# Heap new generation
-#ES_HEAP_NEWSIZE=
-
-# Maximum direct memory
-#ES_DIRECT_SIZE=
-
-# Additional Java OPTS
-{% if es_java_opts is defined and es_java_opts %}
-ES_JAVA_OPTS="{{es_java_opts | default([]) | join(' ')}}"
-{% else %}
-#ES_JAVA_OPTS=
-{% endif %}
+ES_JVM_OPTIONS={{conf_dir}}/jvm.options
 
 # Configure restart on package upgrade (true, every other setting will lead to not restarting)
 #ES_RESTART_ON_UPGRADE=true
@@ -63,6 +44,9 @@ ES_JAVA_OPTS="{{es_java_opts | default([]) | join(' ')}}"
 ES_USER={{es_user}}
 ES_GROUP={{es_group}}
 
+# The number of seconds to wait before checking if Elasticsearch started successfully as a daemon process
+ES_STARTUP_SLEEP_TIME=5
+
 ################################
 # System properties
 ################################
@@ -89,3 +73,6 @@ MAX_LOCKED_MEMORY=unlimited
 # When using Systemd, this setting is ignored and the 'vm.max_map_count'
 # property is set at boot time in /usr/lib/sysctl.d/elasticsearch.conf
 #MAX_MAP_COUNT=262144
+{% if es_max_map_count is defined %}
+MAX_MAP_COUNT={{es_max_map_count}}
+{% endif %}