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

diff --git a/elasticsearch/server/init.sls b/elasticsearch/server/init.sls
index 14cc9f8..8b2ec70 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:
@@ -48,6 +47,8 @@ elasticsearch_logrotate:
   - template: jinja
 {%- endif %}
 
+{%- if not grains.get('noservices', False) %}
+
 elasticsearch_service:
   service.running:
   - enable: true
@@ -58,3 +59,5 @@ elasticsearch_service:
     - file: elasticsearch_default
 
 {%- endif %}
+
+{%- endif %}