From 4955b552df564b9fa78653d7bd9ce738ac7f1ebc Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 13 Aug 2021 17:42:37 -0400 Subject: [PATCH] remove - --- salt/curator/init.sls | 2 +- salt/curator/map.jinja | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/curator/init.sls b/salt/curator/init.sls index aa360c0d4..144864b44 100644 --- a/salt/curator/init.sls +++ b/salt/curator/init.sls @@ -140,7 +140,7 @@ so-curator: - force: True {% endif %} - {% if CURATOROPTIONS.manage_so-status %} + {% if CURATOROPTIONS.manage_sostatus %} append_so-curator_so-status.conf: file.append: - name: /opt/so/conf/so-status/so-status.conf diff --git a/salt/curator/map.jinja b/salt/curator/map.jinja index 8796050eb..9b4a75a96 100644 --- a/salt/curator/map.jinja +++ b/salt/curator/map.jinja @@ -1,14 +1,14 @@ {% set CURATOROPTIONS = {} %} {% set ENABLED = salt['pillar.get']('curator:enabled', True) %} {% set TRUECLUSTER = salt['pillar.get']('elasticsearch:true_cluster', False) %} -{% do CURATOROPTIONS.update({'manage_so-status': True}) %} +{% do CURATOROPTIONS.update({'manage_sostatus': True}) %} # don't start the docker container if searchnode and true clustering is enabled or curator disabled via pillar or true cluster not enabled and manager {% if not ENABLED or (TRUECLUSTER and grains.id.split('_')|last == 'searchnode') or (not TRUECLUSTER and grains.id.split('_')|last == 'manager') %} {% do CURATOROPTIONS.update({'start': False}) %} {% do CURATOROPTIONS.update({'status': 'absent'}) %} {% if (TRUECLUSTER and grains.id.split('_')|last == 'searchnode') or (not TRUECLUSTER and grains.id.split('_')|last == 'manager') %} - {% do CURATOROPTIONS.update({'manage_so-status': False}) %} + {% do CURATOROPTIONS.update({'manage_sostatus': False}) %} {% endif %}%} {% else %} {% do CURATOROPTIONS.update({'start': True}) %}