From: thouveng <thouveng@gmail.com>
Date: Mon, 5 Dec 2016 09:38:27 +0000 (+0100)
Subject: Merge pull request #23 from thouveng/seperate-config-and-objects
X-Git-Tag: 2016.12~2
X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=commitdiff_plain;h=033675c52d32df928df572630b78e67cb3f624f5;hp=fef146eb5b3ac35f346be7b504148ee344ce8d04

Merge pull request #23 from thouveng/seperate-config-and-objects

Separate the configuration and other part fo the client
---

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 4c8246e..9621bbb 100644
--- 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) %}
 
-/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 }}:
diff --git a/elasticsearch/client/service.sls b/elasticsearch/client/service.sls
new file mode 100644
index 0000000..66a33f8
--- /dev/null
+++ b/elasticsearch/client/service.sls
@@ -0,0 +1,15 @@
+{%- 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 }}
+
+{%- endif %}