From 8af57d4a767c5e63f255691eda77968a5145536b Mon Sep 17 00:00:00 2001 From: Martin Polreich Date: Tue, 12 Jun 2018 14:37:44 +0200 Subject: [PATCH] Replace Salt elasticsearch_index_template state deprecated since 2017.7 Change-Id: I2a7f608e8bb4745a99e52887c81fe3611c34f739 --- elasticsearch/client/init.sls | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/elasticsearch/client/init.sls b/elasticsearch/client/init.sls index 058f98e..cd6f2fa 100644 --- a/elasticsearch/client/init.sls +++ b/elasticsearch/client/init.sls @@ -4,6 +4,14 @@ include: - elasticsearch.client.service +{%- if grains['saltversioninfo'][0] < 2017 or + (grains['saltversioninfo'][0] == 2017 and grains['saltversioninfo'][1] < 7) %} + {# Since Salt 2017.7 new elasticsearch state is used and elasticsearch_index_... deprecated #} + {% set force_compatibility = True %} +{%- else %} + {% set force_compatibility = False %} +{%- endif %} + {%- for index_name, index in client.get('index', {}).iteritems() %} elasticsearch_index_{{ index_name }}: @@ -19,7 +27,11 @@ elasticsearch_index_{{ index_name }}: {%- endif %} {%- if definition is defined %} + {%- if force_compatibility %} elasticsearch_index_template.present: + {%- else %} + elasticsearch.index_template_present: + {%- endif %} - name: {{ index_name }} - definition: '{{ definition|json }}' {%- else %} @@ -30,7 +42,11 @@ elasticsearch_index_{{ index_name }}: {%- else %} {% set operation = 'delete' %} + {%- if force_compatibility %} elasticsearch_index_template.absent: + {%- else %} + elasticsearch.index_template_absent: + {%- endif %} - name: {{ index_name }} {%- endif %} -- 2.32.7