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

diff --git a/elasticsearch/server/init.sls b/elasticsearch/server/init.sls
index 14cc9f8..5206bb6 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:
@@ -52,6 +51,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