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 #12 from thouveng/add-missing-json
[salt-formulas/elasticsearch.git]
/
elasticsearch
/
map.jinja
diff --git
a/elasticsearch/map.jinja
b/elasticsearch/map.jinja
index 392295fcda7a9fcde1888a805df5395b9556f08b..e2d78718d1e60066f019cc38492be7f5900d08a1 100644
(file)
--- a/
elasticsearch/map.jinja
+++ b/
elasticsearch/map.jinja
@@
-4,13
+4,26
@@
Debian:
pkgs:
- elasticsearch
Debian:
pkgs:
- elasticsearch
+ curator_pkgs:
+ - python-elasticsearch-curator
service: elasticsearch
version: '1.4.4'
RedHat:
pkgs:
- elasticsearch
service: elasticsearch
version: '1.4.4'
RedHat:
pkgs:
- elasticsearch
+ curator_pkgs:
+ - python-elasticsearch-curator
service: elasticsearch
version: '1.4.4'
{%- endload %}
{%- set server = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('elasticsearch:server')) %}
service: elasticsearch
version: '1.4.4'
{%- endload %}
{%- set server = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('elasticsearch:server')) %}
+
+{%- load_yaml as client_defaults %}
+default:
+ server:
+ host: 127.0.0.1
+ port: 9200
+{%- endload %}
+
+{%- set client = salt['grains.filter_by'](client_defaults, merge=salt['pillar.get']('elasticsearch:client')) %}