decouple elasticsearch version from JDK version

Using the bundled JDK means we have to update elasticsearch whenever a new java version comes out which.... doesn't work for us

Author: bengerman13

config/blobs.yml

@@ -74,10 +74,10 @@ curator/vendor/voluptuous-0.11.5-py2.py3-none-any.whl:
   size: 27677
   object_id: 6889d3b8-07e8-4e17-49a0-474405676494
   sha: sha256:303542b3fc07fb52ec3d7a1c614b329cdbee13a9d681935353d8ea56a7bfa9f1
-elasticsearch/elasticsearch-7.9.3-linux-x86_64.tar.gz:
-  size: 306436527
-  object_id: b2475aef-c383-4a5e-597f-669699394a8d
-  sha: sha256:ae815dca86b0a567185f3f6d4fad047b2f8b6f38c1eee424291cc527261c1c5c
+elasticsearch/elasticsearch-7.9.3-no-jdk-linux-x86_64.tar.gz:
+  size: 162808745
+  object_id: e3856ece-c8a3-4c2b-6097-53a75ee5eeca
+  sha: sha256:2ab0e23277e2fd9365b53af2653e6107ab46db2117390e84ba53385a96f3559f
 haproxy/haproxy-1.7.5.tar.gz:
   size: 1743979
   object_id: 4ee72933-de11-4d3c-4657-b6b284388def

jobs/elasticsearch/templates/bin/elasticsearch

@@ -9,6 +9,7 @@ export LANG=en_US.UTF-8
 export TMP_DIR=/var/vcap/sys/tmp/$JOB_NAME
 export JOB_DIR=/var/vcap/jobs/$JOB_NAME
 export LOG_DIR=/var/vcap/sys/log/$JOB_NAME
+source /var/vcap/packages/openjdk-11/bosh/runtime.env
 
 <% p("elasticsearch.exec.environment", {}).each do |k, v| %>
 export <%= k %>=<%= v %>
@@ -19,7 +20,8 @@ export HEAP_SIZE=$((( $( cat /proc/meminfo | grep MemTotal | awk '{ print $2 }'
   HEAP_SIZE=<%= heap_size %>
 <% end %>
 
-export ES_JAVA_OPTS="-Xms$HEAP_SIZE -Xmx$HEAP_SIZE -Djava.io.tmpdir=$TMP_DIR"
+export ES_JAVA_OPTS="-Xms$HEAP_SIZE -Xmx$HEAP_SIZE"
+export ES_TMPDIR="$TMP_DIR"
 export ES_PATH_CONF=${JOB_DIR}/config
 
 export MAX_OPEN_FILES=<%= p("elasticsearch.limits.fd") %>

packages/elasticsearch/packaging

@@ -1,8 +1,6 @@
 set -e
 
-tar xzf elasticsearch/elasticsearch-7.9.3-linux-x86_64.tar.gz -C $BOSH_INSTALL_TARGET --strip-components 1
-
-chown -R root:vcap "${BOSH_INSTALL_TARGET}/jdk"
+tar xzf elasticsearch/elasticsearch-7.9.3-no-jdk-linux-x86_64.tar.gz -C $BOSH_INSTALL_TARGET --strip-components 1
 
 # For log4j 2.14 or older. Remove after we update Elasticsearch to 7.16.2 or higher. 
 /bin/rm -f "${BOSH_INSTALL_TARGET}/bin/elasticsearch-sql-cli-7.9.3.jar"

packages/elasticsearch/spec

@@ -1,5 +1,8 @@
 ---
 name: elasticsearch
 
+dependencies:
+  - openjdk-11
+
 files:
-  - elasticsearch/elasticsearch-7.9.3-linux-x86_64.tar.gz
+  - elasticsearch/elasticsearch-7.9.3-no-jdk-linux-x86_64.tar.gz