X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=blobdiff_plain;f=elasticsearch%2Fserver%2Finit.sls;h=7995faf00dc65c6b02b6dc02995c6a6639833b98;hp=ee984cbf11244c88d400269b9a23163cbbb4ad30;hb=8c207eaf594db1a33c230b261541f7890aec5746;hpb=2f74007e592ad51467a93a312c6ed41dfd46a1a0

diff --git a/elasticsearch/server/init.sls b/elasticsearch/server/init.sls
index ee984cb..7995faf 100644
--- a/elasticsearch/server/init.sls
+++ b/elasticsearch/server/init.sls
@@ -36,11 +36,11 @@ elasticsearch_logging:
     - pkg: elasticsearch_packages
 {%- endif %}
 
-{%- if server.version == 5 %}
+{%- if server.version in [5, 6] %}
 elasticsearch_logging:
   file.managed:
   - name: /etc/elasticsearch/log4j2.properties
-  - source: salt://elasticsearch/files/v5/log4j2.properties
+  - source: salt://elasticsearch/files/v{{ server.version }}/log4j2.properties
   - template: jinja
   - require:
     - pkg: elasticsearch_packages
@@ -48,7 +48,7 @@ elasticsearch_logging:
 elasticsearch_jvm_options:
   file.managed:
   - name: /etc/elasticsearch/jvm.options
-  - source: salt://elasticsearch/files/v5/jvm.options
+  - source: salt://elasticsearch/files/v{{ server.version }}/jvm.options
   - template: jinja
   - require:
     - pkg: elasticsearch_packages