From b54632080ee4962985a2b50fd98bc5ae55c384fa Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 16 May 2024 16:04:17 -0400 Subject: [PATCH] check if exists in override before popping --- salt/elasticsearch/template.map.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/elasticsearch/template.map.jinja b/salt/elasticsearch/template.map.jinja index 8d40d9e4d..4a90a4f54 100644 --- a/salt/elasticsearch/template.map.jinja +++ b/salt/elasticsearch/template.map.jinja @@ -21,7 +21,7 @@ {% for index, settings in ES_INDEX_SETTINGS_GLOBAL_OVERRIDES.items() %} {# if policy isn't defined in the original index settings, then dont merge policy from the global_overrides #} {# this will prevent so-elasticsearch-ilm-policy-load from trying to load policy on non ILM manged indices #} -{% if not ES_INDEX_SETTINGS_ORIG[index].policy is defined %} +{% if not ES_INDEX_SETTINGS_ORIG[index].policy is defined and ES_INDEX_SETTINGS_GLOBAL_OVERRIDES[index].policy is defined %} {% do ES_INDEX_SETTINGS_GLOBAL_OVERRIDES[index].pop('policy') %} {% endif %}