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 "Add a possibility to deploy Elasticsearch 5.x version"
[salt-formulas/elasticsearch.git]
/
elasticsearch
/
map.jinja
diff --git
a/elasticsearch/map.jinja
b/elasticsearch/map.jinja
index 94f12fa888c53a9e748d9fe5acf1e6a7779fba8d..b69b3698f78c7a68b4083472e66f8b612a339f12 100644
(file)
--- a/
elasticsearch/map.jinja
+++ b/
elasticsearch/map.jinja
@@
-15,9
+15,11
@@
RedHat:
- python-elasticsearch-curator
service: elasticsearch
version: '1.4.4'
- python-elasticsearch-curator
service: elasticsearch
version: '1.4.4'
+default:
+ version: 2
{%- endload %}
{%- endload %}
-{%- set server = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('elasticsearch:server')) %}
+{%- set server = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('elasticsearch:server')
, base='default'
) %}
{%- load_yaml as client_defaults %}
Debian:
{%- load_yaml as client_defaults %}
Debian: