From: Martin Polreich <polreichmartin@gmail.com>
Date: Thu, 8 Jun 2017 13:16:16 +0000 (+0200)
Subject: Optimize 'noservices' condition
X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=commitdiff_plain;h=7f3da1af7c7f448703d1862f4513493f5ae39624;hp=637b32460f4f192a258fd1e62be2414bed97ab07

Optimize 'noservices' condition
---

diff --git a/elasticsearch/server/init.sls b/elasticsearch/server/init.sls
index 8b2ec70..5206bb6 100644
--- a/elasticsearch/server/init.sls
+++ b/elasticsearch/server/init.sls
@@ -47,17 +47,16 @@ elasticsearch_logrotate:
   - template: jinja
 {%- endif %}
 
-{%- if not grains.get('noservices', False) %}
-
 elasticsearch_service:
   service.running:
   - enable: true
   - name: {{ server.service }}
+  {%- if grains.get('noservices') %}
+  - onlyif: /bin/false
+  {%- endif %}
   - watch:
     - file: elasticsearch_config
     - file: elasticsearch_logging
     - file: elasticsearch_default
 
 {%- endif %}
-
-{%- endif %}