X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=blobdiff_plain;f=elasticsearch%2Fmap.jinja;h=000a1f4e97d461d5b15ff105949a12b8d1eb4de6;hp=3c0378572b0ff1893be54c255211e161b0e64e61;hb=7d15cc70e5fc1f77fe0f1f652d812f2fabac4aea;hpb=5163dfb7b145991603a877b6e862c877ac0f3962 diff --git a/elasticsearch/map.jinja b/elasticsearch/map.jinja index 3c03785..000a1f4 100644 --- a/elasticsearch/map.jinja +++ b/elasticsearch/map.jinja @@ -1,13 +1,20 @@ -{% set server = salt['grains.filter_by']({ - 'Debian': { - 'pkgs': ['elasticsearch'], - 'service': 'elasticsearch', - 'version': '1.4.4', - }, - 'RedHat': { - 'pkgs': ['elasticsearch'], - 'service': 'elasticsearch', - 'version': '1.4.4', - }, -}, merge=salt['pillar.get']('elasticsearch:server')) %} + +{%- load_yaml as base_defaults %} +Debian: + pkgs: + - elasticsearch + curator_pkgs: + - python-elasticsearch-curator + 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')) %}