aljaz/ansible-elasticsearch
1
0
Fork 0
mirror of https://github.com/aljazceru/ansible-elasticsearch.git synced 2025-12-17 09:04:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sleep on init + cleanup

Browse Source
This commit is contained in:
Dale McDiarmid
2017-01-17 12:54:29 +00:00
parent b6b9d19082
commit baf3a7c9f5
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
handlers/elasticsearch-restart.yml
View File

@@ -1,8 +1,8 @@
--- ---
- name: Restart Elasticsearch - 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)) 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 - name: Wait for elasticsearch to startup
wait_for: host={{es_api_host}} port={{es_api_port}} delay=10 wait_for: host={{es_api_host}} port={{es_api_port}} delay=5 connect_timeout=1

2
templates/init/debian/elasticsearch.j2
View File

@@ -69,6 +69,8 @@ MAX_MAP_COUNT={{es_max_map_count}}
# Elasticsearch PID file directory # Elasticsearch PID file directory
PID_DIR={{pid_dir}} PID_DIR={{pid_dir}}
ES_JVM_OPTIONS="{{conf_dir}}/jvm.options"
# End of variables that can be overwritten in $DEFAULT # End of variables that can be overwritten in $DEFAULT
# overwrite settings from default file # overwrite settings from default file

1
templates/init/redhat/elasticsearch.j2
View File

@@ -48,6 +48,7 @@ DATA_DIR={{ data_dirs | array_to_str }}
CONF_DIR="{{conf_dir}}" CONF_DIR="{{conf_dir}}"
PID_DIR="{{pid_dir}}" PID_DIR="{{pid_dir}}"
ES_JVM_OPTIONS="{{conf_dir}}/jvm.options"
# Source the default env file # Source the default env file
ES_ENV_FILE="{{instance_default_file}}" ES_ENV_FILE="{{instance_default_file}}"