evolix
/
ansible-roles
22
2
Fork 2
Code Issues 61 Pull Requests 18 Releases 32 Wiki Activity

elasticsearch: fix datadir/tmpdir conditions

This commit is contained in:
Jérémy Lecour 2017-11-14 11:05:54 +01:00 committed by Jérémy Lecour
parent 430f36c0e7
commit 5800159830
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
elasticsearch/tasks/datadir.yml
View File

@ -7,16 +7,16 @@
register: elasticsearch_custom_datadir_test
check_mode: no
- name: "read the real datadir"
command: readlink -f /var/lib/elasticsearch
changed_when: false
register: elasticsearch_current_real_datadir_test
check_mode: no
tags:
- elasticsearch
when: elasticsearch_custom_datadir
when:
- elasticsearch_custom_datadir != ''
- elasticsearch_custom_datadir != None
- block:
- name: elasticsearch is stopped
@ -40,5 +40,9 @@
name: elasticsearch
state: started
tags:
- elasticsearch
when: elasticsearch_custom_datadir and elasticsearch_custom_datadir != elasticsearch_current_real_datadir_test.stdout and not elasticsearch_custom_datadir_test.stat.exists
- elasticsearch
when:
- elasticsearch_custom_datadir != ''
- elasticsearch_custom_datadir != None
- elasticsearch_custom_datadir != elasticsearch_current_real_datadir_test.stdout
- not elasticsearch_custom_datadir_test.stat.exists

2
elasticsearch/tasks/tmpdir.yml
View File

@ -28,4 +28,4 @@
- restart elasticsearch
tags:
- elasticsearch
when: elasticsearch_custom_tmpdir or fstab_tmp_noexec | success
when: (elasticsearch_custom_tmpdir != '' and elasticsearch_custom_tmpdir != None) or fstab_tmp_noexec | success