From 05b1a445d3c66436d669d6a41892bbcd4a72def8 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 21 Mar 2023 10:12:10 -0400 Subject: [PATCH 1/2] use saltversion grain to determine installed version --- salt/salt/map.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/salt/map.jinja b/salt/salt/map.jinja index c7d4cab38..14e735b56 100644 --- a/salt/salt/map.jinja +++ b/salt/salt/map.jinja @@ -17,7 +17,7 @@ {% set SYSTEMD_UNIT_FILE = '/usr/lib/systemd/system/salt-minion.service' %} {% endif %} -{% set INSTALLEDSALTVERSION = salt['pkg.version']('salt-minion').split(SPLITCHAR)[0] %} +{% set INSTALLEDSALTVERSION = grains.saltversion %} {% if grains.saltversion|string != SALTVERSION|string %} {% if grains.os|lower in ['Rocky', 'redhat'] %} From efd5f7b8a238cba6ca19413079b314c14c63eda6 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Tue, 21 Mar 2023 10:44:21 -0400 Subject: [PATCH 2/2] catch errors and exit with proper exit code --- salt/elasticsearch/tools/sbin/so-elasticsearch-templates-load | 3 +++ 1 file changed, 3 insertions(+) diff --git a/salt/elasticsearch/tools/sbin/so-elasticsearch-templates-load b/salt/elasticsearch/tools/sbin/so-elasticsearch-templates-load index ba968d2fe..a10d07e13 100755 --- a/salt/elasticsearch/tools/sbin/so-elasticsearch-templates-load +++ b/salt/elasticsearch/tools/sbin/so-elasticsearch-templates-load @@ -31,8 +31,11 @@ if [ "$ELASTICSEARCH_CONNECTED" == "no" ]; then echo echo -e "Connection attempt timed out. Unable to connect to ElasticSearch. \nPlease try: \n -checking log(s) in /var/log/elasticsearch/\n -running 'sudo docker ps' \n -running 'sudo so-elastic-restart'" echo + exit 1 fi +set -e + cd ${ELASTICSEARCH_TEMPLATES}/component/ecs echo "Loading ECS component templates..."