santerikainulainen/ansible-role-elasticsearch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update system config to current version provided by elasticsearch package

Browse source 
This is removing lot of options deprecated since 6.0 like ES_JVM_OPTIONS, CONF_DIR, DATA_DIR and LOG_DIR (https://www.elastic.co/guide/en/elasticsearch/reference/6.0/breaking_60_packaging_changes.html)
This commit is contained in:
Julien Mailleret 2019-11-26 23:42:17 +01:00
parent dc813aec3d
commit 36fe944048
No known key found for this signature in database
GPG key ID: F065093271C8DE71
1 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

28
templates/elasticsearch.j2
View file

@ -9,30 +9,23 @@ ES_HOME={{es_home}}
#JAVA_HOME= #JAVA_HOME=
# Elasticsearch configuration directory # Elasticsearch configuration directory
CONF_DIR={{ es_conf_dir }}
ES_PATH_CONF={{ es_conf_dir }} ES_PATH_CONF={{ es_conf_dir }}
# Elasticsearch data directory
DATA_DIR={{ es_data_dirs | array_to_str }}
# Elasticsearch logs directory
LOG_DIR={{ es_log_dir }}
# Elasticsearch PID directory # Elasticsearch PID directory
PID_DIR={{ es_pid_dir }} PID_DIR={{ es_pid_dir }}
ES_JVM_OPTIONS={{ es_conf_dir }}/jvm.options # Additional Java OPTS
ES_JAVA_OPTS=
# Configure restart on package upgrade (true, every other setting will lead to not restarting) # Configure restart on package upgrade (true, every other setting will lead to not restarting)
#ES_RESTART_ON_UPGRADE=true #RESTART_ON_UPGRADE=true
# Path to the GC log file
#ES_GC_LOG_FILE=/var/log/elasticsearch/gc.log
################################ ################################
# Elasticsearch service # Elasticsearch service
################################ ################################
# SysV init.d
#
# The number of seconds to wait before checking if Elasticsearch started successfully as a daemon process # The number of seconds to wait before checking if Elasticsearch started successfully as a daemon process
ES_STARTUP_SLEEP_TIME=5 ES_STARTUP_SLEEP_TIME=5
@ -43,17 +36,17 @@ ES_STARTUP_SLEEP_TIME=5
# Specifies the maximum file descriptor number that can be opened by this process # Specifies the maximum file descriptor number that can be opened by this process
# When using Systemd, this setting is ignored and the LimitNOFILE defined in # When using Systemd, this setting is ignored and the LimitNOFILE defined in
# /usr/lib/systemd/system/elasticsearch.service takes precedence # /usr/lib/systemd/system/elasticsearch.service takes precedence
#MAX_OPEN_FILES=65535
{% if es_max_open_files is defined %} {% if es_max_open_files is defined %}
#MAX_OPEN_FILES
MAX_OPEN_FILES={{es_max_open_files}} MAX_OPEN_FILES={{es_max_open_files}}
{% endif %} {% endif %}
# The maximum number of bytes of memory that may be locked into RAM # The maximum number of bytes of memory that may be locked into RAM
# Set to "unlimited" if you use the 'bootstrap.memory_lock: true' option # Set to "unlimited" if you use the 'bootstrap.memory_lock: true' option
# in elasticsearch.yml # in elasticsearch.yml.
# When using Systemd, the LimitMEMLOCK property must be set # When using systemd, LimitMEMLOCK must be set in a unit file such as
# in /usr/lib/systemd/system/elasticsearch.service # /etc/systemd/system/elasticsearch.service.d/override.conf.
#MAX_LOCKED_MEMORY= #MAX_LOCKED_MEMORY=unlimited
{% if m_lock_enabled %} {% if m_lock_enabled %}
MAX_LOCKED_MEMORY=unlimited MAX_LOCKED_MEMORY=unlimited
{% endif %} {% endif %}
@ -65,4 +58,3 @@ MAX_LOCKED_MEMORY=unlimited
{% if es_max_map_count is defined %} {% if es_max_map_count is defined %}
MAX_MAP_COUNT={{es_max_map_count}} MAX_MAP_COUNT={{es_max_map_count}}
{% endif %} {% endif %}