[Cleanup] Clean up elasticsearch role

Don't compare with empty string

Explicitly checkout master branch of head repository.

Space after variable name
This commit is contained in:
Mathieu Trossevin 2020-06-18 17:58:37 +02:00
parent 26eec48954
commit 63a0894906
Signed by: mtrossevin
GPG Key ID: 81987323AE7F3E99
4 changed files with 5 additions and 4 deletions

View File

@ -16,7 +16,7 @@
tags:
- elasticsearch
when:
- elasticsearch_custom_datadir != ''
- elasticsearch_custom_datadir
- elasticsearch_custom_datadir != None
- name: Datadir is moved to custom path
@ -44,7 +44,7 @@
tags:
- elasticsearch
when:
- elasticsearch_custom_datadir != ''
- elasticsearch_custom_datadir
- elasticsearch_custom_datadir != None
- elasticsearch_custom_datadir != elasticsearch_current_real_datadir_test.stdout
- not elasticsearch_custom_datadir_test.stat.exists

View File

@ -15,6 +15,7 @@
repo: "https://github.com/mobz/elasticsearch-head.git"
dest: "{{ elasticsearch_plugin_head_clone_dir }}"
clone: yes
version: master
tags:
- packages

View File

@ -54,4 +54,4 @@
tags:
- elasticsearch
when: elastic_stack_version is version('6', '>=')
when: (elasticsearch_custom_tmpdir != '' and elasticsearch_custom_tmpdir != None) or fstab_tmp_noexec.rc == 0
when: (elasticsearch_custom_tmpdir and elasticsearch_custom_tmpdir != None) or fstab_tmp_noexec.rc == 0

View File

@ -15,7 +15,7 @@
- name: Install openjdk package
apt:
name: "openjdk-{{ java_version}}-jre-headless"
name: "openjdk-{{ java_version }}-jre-headless"
default_release: "{{ java_apt_release }}"
state: present
tags: