forked from evolix/ansible-roles
elasticsearch: Use /etc/elasticsearch/jvm.options.d/evolinux
instead of default /etc/elasticsearch/jvm.options
This commit is contained in:
parent
981128dc17
commit
a2f73bb7df
|
@ -18,6 +18,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
|
|||
|
||||
### Changed
|
||||
|
||||
* elasticsearch: Use `/etc/elasticsearch/jvm.options.d/evolinux` instead of default `/etc/elasticsearch/jvm.options`
|
||||
* openvpn: make it compatible with OpenBSD and add some improvements
|
||||
|
||||
### Fixed
|
||||
|
|
|
@ -96,17 +96,25 @@
|
|||
|
||||
- name: JVM Heap size (min) is set
|
||||
lineinfile:
|
||||
dest: /etc/elasticsearch/jvm.options
|
||||
dest: /etc/elasticsearch/jvm.options.d/evolinux
|
||||
regexp: "^-Xms"
|
||||
line: "-Xms{{ elasticsearch_jvm_xms }}"
|
||||
create: yes
|
||||
owner: root
|
||||
group: elasticsearch
|
||||
mode: 0640
|
||||
tags:
|
||||
- config
|
||||
|
||||
- name: JVM Heap size (max) is set
|
||||
lineinfile:
|
||||
dest: /etc/elasticsearch/jvm.options
|
||||
dest: /etc/elasticsearch/jvm.options.d/evolinux
|
||||
regexp: "^-Xmx"
|
||||
line: "-Xmx{{ elasticsearch_jvm_xmx }}"
|
||||
create: yes
|
||||
owner: root
|
||||
group: elasticsearch
|
||||
mode: 0640
|
||||
tags:
|
||||
- config
|
||||
|
||||
|
|
|
@ -26,10 +26,13 @@
|
|||
|
||||
- name: change JVM tmpdir (< 6.x)
|
||||
lineinfile:
|
||||
dest: /etc/elasticsearch/jvm.options
|
||||
dest: /etc/elasticsearch/jvm.options.d/evolinux
|
||||
line: "-Djava.io.tmpdir={{ _elasticsearch_custom_tmpdir }}"
|
||||
regexp: "^-Djava.io.tmpdir="
|
||||
insertafter: "## JVM configuration"
|
||||
create: yes
|
||||
owner: root
|
||||
group: elasticsearch
|
||||
mode: 0640
|
||||
notify:
|
||||
- restart elasticsearch
|
||||
tags:
|
||||
|
@ -48,6 +51,7 @@
|
|||
- elasticsearch
|
||||
when: elastic_stack_version is version('6', '>=')
|
||||
|
||||
# Note : Should not do any changes as -Djava.io.tmpdir=${ES_TMPDIR} is already here in the default config.
|
||||
- name: change JVM tmpdir (>= 6.x)
|
||||
lineinfile:
|
||||
dest: /etc/elasticsearch/jvm.options
|
||||
|
|
Loading…
Reference in a new issue