Code Review
/
salt-formulas
/
elasticsearch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add Elasticsearch 6 support
[salt-formulas/elasticsearch.git]
/
elasticsearch
/
server
/
init.sls
diff --git
a/elasticsearch/server/init.sls
b/elasticsearch/server/init.sls
index ee984cbf11244c88d400269b9a23163cbbb4ad30..7995faf00dc65c6b02b6dc02995c6a6639833b98 100644
(file)
--- a/
elasticsearch/server/init.sls
+++ b/
elasticsearch/server/init.sls
@@
-36,11
+36,11
@@
elasticsearch_logging:
- pkg: elasticsearch_packages
{%- endif %}
- pkg: elasticsearch_packages
{%- endif %}
-{%- if server.version
== 5
%}
+{%- if server.version
in [5, 6]
%}
elasticsearch_logging:
file.managed:
- name: /etc/elasticsearch/log4j2.properties
elasticsearch_logging:
file.managed:
- name: /etc/elasticsearch/log4j2.properties
- - source: salt://elasticsearch/files/v
5
/log4j2.properties
+ - source: salt://elasticsearch/files/v
{{ server.version }}
/log4j2.properties
- template: jinja
- require:
- pkg: elasticsearch_packages
- template: jinja
- require:
- pkg: elasticsearch_packages
@@
-48,7
+48,7
@@
elasticsearch_logging:
elasticsearch_jvm_options:
file.managed:
- name: /etc/elasticsearch/jvm.options
elasticsearch_jvm_options:
file.managed:
- name: /etc/elasticsearch/jvm.options
- - source: salt://elasticsearch/files/v
5
/jvm.options
+ - source: salt://elasticsearch/files/v
{{ server.version }}
/jvm.options
- template: jinja
- require:
- pkg: elasticsearch_packages
- template: jinja
- require:
- pkg: elasticsearch_packages