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
Separate the configuration and other part of the client
[salt-formulas/elasticsearch.git]
/
elasticsearch
/
client
/
init.sls
diff --git
a/elasticsearch/client.sls
b/elasticsearch/client/init.sls
similarity index 70%
rename from
elasticsearch/client.sls
rename to
elasticsearch/client/init.sls
index 4c8246ef1d3739f8983c1e1284dcff57ae1219dc..9621bbbe329e7fd7024dd90855307b342173b79e 100644
(file)
--- a/
elasticsearch/client.sls
+++ b/
elasticsearch/client/init.sls
@@
-1,16
+1,8
@@
{%- from "elasticsearch/map.jinja" import client with context %}
{%- if client.get('enabled', False) %}
{%- from "elasticsearch/map.jinja" import client with context %}
{%- if client.get('enabled', False) %}
-/etc/salt/minion.d/_elasticsearch.conf:
- file.managed:
- - source: salt://elasticsearch/files/_elasticsearch.conf
- - template: jinja
- - user: root
- - group: root
-
-elasticsearch_client_packages:
- pkg.installed:
- - names: {{ client.pkgs }}
+include:
+ - elasticsearch.client.service
{%- for index_name, index in client.get('index', {}).iteritems() %}
elasticsearch_index_{{ index_name }}:
{%- for index_name, index in client.get('index', {}).iteritems() %}
elasticsearch_index_{{ index_name }}: