From baf3a7c9f5fc8d9388229b0790646ffebdebe355 Mon Sep 17 00:00:00 2001
From: Dale McDiarmid <dalem@elastic.co>
Date: Tue, 17 Jan 2017 12:54:29 +0000
Subject: [PATCH] Sleep on init + cleanup

---
 handlers/elasticsearch-restart.yml     | 4 ++--
 templates/init/debian/elasticsearch.j2 | 2 ++
 templates/init/redhat/elasticsearch.j2 | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/handlers/elasticsearch-restart.yml b/handlers/elasticsearch-restart.yml
index 24d444b..03e7b5f 100644
--- a/handlers/elasticsearch-restart.yml
+++ b/handlers/elasticsearch-restart.yml
@@ -1,8 +1,8 @@
 ---
 
 - name: Restart Elasticsearch
-  service: name={{instance_init_script | basename}} state=restarted enabled=yes
+  service: name={{instance_init_script | basename}} state=restarted enabled=yes sleep=5
   when: es_restart_on_change and es_start_service and ((plugin_installed is defined and plugin_installed.changed) or (config_updated is defined and config_updated.changed) or (xpack_state.changed) or (debian_elasticsearch_install_from_repo.changed or redhat_elasticsearch_install_from_repo.changed or elasticsearch_install_from_package.changed))
 
 - name: Wait for elasticsearch to startup
-  wait_for: host={{es_api_host}} port={{es_api_port}} delay=10
\ No newline at end of file
+  wait_for: host={{es_api_host}} port={{es_api_port}} delay=5 connect_timeout=1
\ No newline at end of file
diff --git a/templates/init/debian/elasticsearch.j2 b/templates/init/debian/elasticsearch.j2
index 8312be4..5a21e47 100755
--- a/templates/init/debian/elasticsearch.j2
+++ b/templates/init/debian/elasticsearch.j2
@@ -69,6 +69,8 @@ MAX_MAP_COUNT={{es_max_map_count}}
 # Elasticsearch PID file directory
 PID_DIR={{pid_dir}}
 
+ES_JVM_OPTIONS="{{conf_dir}}/jvm.options"
+
 # End of variables that can be overwritten in $DEFAULT
 
 # overwrite settings from default file
diff --git a/templates/init/redhat/elasticsearch.j2 b/templates/init/redhat/elasticsearch.j2
index b50d63b..f906074 100755
--- a/templates/init/redhat/elasticsearch.j2
+++ b/templates/init/redhat/elasticsearch.j2
@@ -48,6 +48,7 @@ DATA_DIR={{ data_dirs | array_to_str }}
 CONF_DIR="{{conf_dir}}"
 
 PID_DIR="{{pid_dir}}"
+ES_JVM_OPTIONS="{{conf_dir}}/jvm.options"
 
 # Source the default env file
 ES_ENV_FILE="{{instance_default_file}}"