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
Extend template definition options
[salt-formulas/elasticsearch.git]
/
elasticsearch
/
client
/
init.sls
diff --git
a/elasticsearch/client/init.sls
b/elasticsearch/client/init.sls
index 9621bbbe329e7fd7024dd90855307b342173b79e..c9500260c636a1cd32d3af0cc7bbc3eba9b81f55 100644
(file)
--- a/
elasticsearch/client/init.sls
+++ b/
elasticsearch/client/init.sls
@@
-6,17
+6,44
@@
include:
{%- for index_name, index in client.get('index', {}).iteritems() %}
elasticsearch_index_{{ index_name }}:
{%- for index_name, index in client.get('index', {}).iteritems() %}
elasticsearch_index_{{ index_name }}:
+
{%- if index.get('enabled', False) %}
{%- 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 %}
{%- import_json index.template as definition %}
+ {%- endif %}
+
+ {%- if definition is defined %}
+ elasticsearch_index_template.present:
- name: {{ index_name }}
- definition: '{{ definition|json }}'
{%- else %}
- 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 %}
elasticsearch_index_template.absent:
- name: {{ index_name }}
{%- endif %}
+
- require:
- pkg: elasticsearch_client_packages
- require:
- pkg: elasticsearch_client_packages
-{%- endfor %}
+{%- if index.get('force_operation', False) %}
+elasticsearch_index_{{ index_name }}_{{ operation }}:
+ module.run:
+ - name: elasticsearch.index_{{ operation }}
+ - index: {{ index_name }}
{%- endif %}
{%- endif %}
+
+{%- endfor %}
+
+{%- endif %}
\ No newline at end of file