From: Filip Pytloun <filip@pytloun.cz>
Date: Wed, 23 Nov 2016 16:51:26 +0000 (+0100)
Subject: Merge pull request #13 from thouveng/install_python_client
X-Git-Tag: 2016.12~5^2~5
X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=commitdiff_plain;h=edf40a1baffd3f2d453fa27c6fd915d2df4f9797;hp=21c1f465784d4c0ad7e544e8a93bb52bcc6b6298

Merge pull request #13 from thouveng/install_python_client

Salt module elasticsearch depends on elasticsearch-py
---

diff --git a/elasticsearch/client.sls b/elasticsearch/client.sls
index f336cd3..4c8246e 100644
--- a/elasticsearch/client.sls
+++ b/elasticsearch/client.sls
@@ -8,6 +8,10 @@
   - user: root
   - group: root
 
+elasticsearch_client_packages:
+  pkg.installed:
+  - names: {{ client.pkgs }}
+
 {%- for index_name, index in client.get('index', {}).iteritems() %}
 elasticsearch_index_{{ index_name }}:
   {%- if index.get('enabled', False) %}
@@ -19,6 +23,8 @@ elasticsearch_index_{{ index_name }}:
   elasticsearch_index_template.absent:
   - name: {{ index_name }}
   {%- endif %}
+  - require:
+    - pkg: elasticsearch_client_packages
 {%- endfor %}
 
 {%- endif %}
diff --git a/elasticsearch/map.jinja b/elasticsearch/map.jinja
index e2d7871..36dd674 100644
--- a/elasticsearch/map.jinja
+++ b/elasticsearch/map.jinja
@@ -20,7 +20,15 @@ RedHat:
 {%- set server = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('elasticsearch:server')) %}
 
 {%- load_yaml as client_defaults %}
-default:
+Debian:
+  pkgs:
+  - python-elasticsearch
+  server:
+    host: 127.0.0.1
+    port: 9200
+RedHat:
+  pkgs:
+  - python-elasticsearch
   server:
     host: 127.0.0.1
     port: 9200