From a7e7618050b390c3b3152053cc2a95cea1d4c01b Mon Sep 17 00:00:00 2001
From: Tim Lieberman <tim@timdev.com>
Date: Wed, 18 Mar 2020 16:34:52 -0700
Subject: [PATCH] Introduce es_java_home variable to allow setting JAVA_HOME
 env var in defaults file.

---
 defaults/main.yml          | 1 +
 templates/elasticsearch.j2 | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/defaults/main.yml b/defaults/main.yml
index 0a51b51..937d9c6 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -47,6 +47,7 @@ es_api_sleep: 15
 es_debian_startup_timeout: 10
 
 # JVM custom parameters
+es_java_home: ''
 es_jvm_custom_parameters: ''
 
 # SSL/TLS parameters
diff --git a/templates/elasticsearch.j2 b/templates/elasticsearch.j2
index 2fc67ff..1d2fd85 100644
--- a/templates/elasticsearch.j2
+++ b/templates/elasticsearch.j2
@@ -6,7 +6,11 @@
 ES_HOME={{es_home}}
 
 # Elasticsearch Java path
+{% if es_java_home | length > 0 %}
+JAVA_HOME={{ es_java_home }}
+{% else %}
 #JAVA_HOME=
+{% endif %}
 
 # Elasticsearch configuration directory
 ES_PATH_CONF={{ es_conf_dir }}