Code Review
/
salt-formulas
/
elasticsearch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge pull request #31 from corest/create_index
[salt-formulas/elasticsearch.git]
/
elasticsearch
/
server
/
init.sls
diff --git
a/elasticsearch/server/init.sls
b/elasticsearch/server/init.sls
index 14cc9f8459a1c297b6cdf5085ea9809293afcc76..8b2ec70cee26909daf2159c059565cfa5cda57ad 100644
(file)
--- 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 %}
{%- from "elasticsearch/map.jinja" import server with context %}
{%- if server.enabled %}
+{%- if server.curator is defined %}
include:
include:
- - java
- {%- if server.curator is defined %}
- elasticsearch.server.curator
- elasticsearch.server.curator
-
{%- endif %}
+{%- endif %}
elasticsearch_packages:
pkg.installed:
elasticsearch_packages:
pkg.installed:
@@
-48,6
+47,8
@@
elasticsearch_logrotate:
- template: jinja
{%- endif %}
- template: jinja
{%- endif %}
+{%- if not grains.get('noservices', False) %}
+
elasticsearch_service:
service.running:
- enable: true
elasticsearch_service:
service.running:
- enable: true
@@
-58,3
+59,5
@@
elasticsearch_service:
- file: elasticsearch_default
{%- endif %}
- file: elasticsearch_default
{%- endif %}
+
+{%- endif %}