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

diff --git a/elasticsearch/server/init.sls b/elasticsearch/server/init.sls
index 14cc9f8..ee984cb 100644
--- a/elasticsearch/server/init.sls
+++ b/elasticsearch/server/init.sls
@@ -1,11 +1,10 @@
 {%- from "elasticsearch/map.jinja" import server with context %}
 {%- if server.enabled %}
 
+{%- if server.curator is defined %}
 include:
-  - java
-  {%- if server.curator is defined %}
   - elasticsearch.server.curator
-  {%- endif %}
+{%- endif %}
 
 elasticsearch_packages:
   pkg.installed:
@@ -14,7 +13,7 @@ elasticsearch_packages:
 elasticsearch_default:
   file.managed:
   - name: /etc/default/elasticsearch
-  - source: salt://elasticsearch/files/elasticsearch
+  - source: salt://elasticsearch/files/v{{ server.version }}/elasticsearch
   - template: jinja
   - require:
     - pkg: elasticsearch_packages
@@ -22,19 +21,59 @@ elasticsearch_default:
 elasticsearch_config:
   file.managed:
   - name: /etc/elasticsearch/elasticsearch.yml
-  - source: salt://elasticsearch/files/elasticsearch.yml
+  - source: salt://elasticsearch/files/v{{ server.version }}/elasticsearch.yml
   - template: jinja
   - require:
     - pkg: elasticsearch_packages
 
+{%- if server.version == 2 %}
 elasticsearch_logging:
   file.managed:
   - name: /etc/elasticsearch/logging.yml
-  - source: salt://elasticsearch/files/logging.yml
+  - source: salt://elasticsearch/files/v2/logging.yml
+  - template: jinja
+  - require:
+    - pkg: elasticsearch_packages
+{%- endif %}
+
+{%- if server.version == 5 %}
+elasticsearch_logging:
+  file.managed:
+  - name: /etc/elasticsearch/log4j2.properties
+  - source: salt://elasticsearch/files/v5/log4j2.properties
+  - template: jinja
+  - require:
+    - pkg: elasticsearch_packages
+
+elasticsearch_jvm_options:
+  file.managed:
+  - name: /etc/elasticsearch/jvm.options
+  - source: salt://elasticsearch/files/v5/jvm.options
   - template: jinja
   - require:
     - pkg: elasticsearch_packages
 
+{%- if grains.get('init') == 'systemd' %}
+elasticsearch_override_limit_memlock_file:
+  file.managed:
+  - name: /etc/systemd/system/elasticsearch.service.d/override.conf
+  - makedirs: True
+  - contents: |
+      [Service]
+      LimitMEMLOCK=infinity
+  - require:
+    - pkg: elasticsearch_packages
+  - watch_in:
+    - module: elasticsearch_restart_systemd
+
+elasticsearch_restart_systemd:
+  module.wait:
+  - name: service.systemctl_reload
+  - watch_in:
+    - service: elasticsearch_service
+{%- endif %}
+{%- endif %}
+
 {%- if server.get('log', {}).logrotate|default(True) and not
        salt['file.file_exists' ]('/etc/logrotate.d/elasticsearch') %}
 {#
@@ -52,6 +91,9 @@ elasticsearch_service:
   service.running:
   - enable: true
   - name: {{ server.service }}
+  {%- if grains.get('noservices') %}
+  - onlyif: /bin/false
+  {%- endif %}
   - watch:
     - file: elasticsearch_config
     - file: elasticsearch_logging