From e142eb13066b7f2dfc5e99d4208cd3e866676317 Mon Sep 17 00:00:00 2001
From: Damien Degois <damien@degois.info>
Date: Thu, 17 May 2018 15:27:51 +0200
Subject: [PATCH] Fix elasticsearch with check_definition

---
 salt/states/elasticsearch.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/salt/states/elasticsearch.py b/salt/states/elasticsearch.py
index 90d635334598..8c822a696293 100644
--- a/salt/states/elasticsearch.py
+++ b/salt/states/elasticsearch.py
@@ -275,9 +275,10 @@ def index_template_present(name, definition, check_definition=False):
                     ret['comment'] = 'Cannot create index template {0}, {1}'.format(name, output)
         else:
             if check_definition:
-                definition_parsed = salt.utils.json.loads(definition)
+                definition_to_diff = {'aliases': {}, 'mappings': {}, 'settings': {}}
+                definition_to_diff.update(definition)
                 current_template = __salt__['elasticsearch.index_template_get'](name=name)[name]
-                diff = __utils__['dictdiffer.deep_diff'](current_template, definition_parsed)
+                diff = __utils__['dictdiffer.deep_diff'](current_template, definition_to_diff)
                 if len(diff) != 0:
                     if __opts__['test']:
                         ret['comment'] = 'Index template {0} exist but need to be updated'.format(name)