X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=blobdiff_plain;f=elasticsearch%2Fclient%2Finit.sls;h=c169e97f51f228b1be3c34d1a1bf2c310e34e91b;hp=9621bbbe329e7fd7024dd90855307b342173b79e;hb=refs%2Fchanges%2F81%2F12081%2F28;hpb=3ad837a7bf51351e2c0ba896fb68f32d7080f970;ds=sidebyside

diff --git a/elasticsearch/client/init.sls b/elasticsearch/client/init.sls
index 9621bbb..c169e97 100644
--- a/elasticsearch/client/init.sls
+++ b/elasticsearch/client/init.sls
@@ -6,17 +6,45 @@ include:
 
 {%- for index_name, index in client.get('index', {}).iteritems() %}
 elasticsearch_index_{{ index_name }}:
+
   {%- if index.get('enabled', False) %}
-  elasticsearch_index_template.present:
+  {% set operation = 'create' %}
+
+  {%- if index.definition is defined %}
+  {% set definition = index.definition %}
+  {%- endif %}
+
+  {%- if index.template is defined %}
   {%- import_json index.template as definition %}
+  {%- endif %}
+
+  {%- if definition is defined %}
+  elasticsearch_index_template.present:
   - name: {{ index_name }}
   - definition: '{{ definition|json }}'
   {%- else %}
+  cmd.run:
+  - name: echo "No definition specified for index {{ index_name }}"
+  {%- endif %}
+
+  {%- else %}
+
+  {% set operation = 'delete' %}
   elasticsearch_index_template.absent:
   - name: {{ index_name }}
   {%- endif %}
+
   - require:
     - pkg: elasticsearch_client_packages
-{%- endfor %}
 
+{%- if index.get('force_operation', False) %}
+elasticsearch_index_{{ index_name }}_{{ operation }}:
+  {% set curdate = None | strftime('%Y.%m.%d') %}
+  module.run:
+    - name: elasticsearch.index_{{ operation }}
+    - index: {{ index_name }}-{{ curdate }}
 {%- endif %}
+
+{%- endfor %}
+
+{%- endif %}
\ No newline at end of file