Merge remote-tracking branch 'elastic/master'
# Conflicts: # meta/main.yml
This commit is contained in:
parent
8915d5f9a5
commit
d94808d7e2
5 changed files with 16 additions and 22 deletions
|
|
@ -1,4 +1,4 @@
|
|||
---
|
||||
java: "{{ es_java | default('openjdk-7-jre-headless') }}"
|
||||
java: "{% if es_java is defined %}{{es_java}}{%elif (ansible_distribution == 'Ubuntu' and ansible_distribution_version | version_compare('15.10', '>=')) %}openjdk-8-jre-headless{% else %}openjdk-7-jre-headless{% endif %}"
|
||||
default_file: "/etc/default/elasticsearch"
|
||||
es_home: "/usr/share/elasticsearch"
|
||||
es_home: "/usr/share/elasticsearch"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue