From 42cc419e00814a77d1ac3b9b613380f1dfeea377 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 27 Mar 2023 11:30:03 -0400 Subject: [PATCH 1/2] restart salt master and minion after manager install completes --- setup/so-setup | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup/so-setup b/setup/so-setup index 06c156305..f51ddb316 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -633,6 +633,8 @@ if ! [[ -f $install_opt_file ]]; then fi checkin_at_boot set_initial_firewall_access + systemctl restart salt-master + systemctl restart salt-minion verify_setup else touch /root/accept_changes From 0d87a5d7392ca08a54d4a9628d4f50e4122ccdec Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 27 Mar 2023 12:51:29 -0400 Subject: [PATCH 2/2] import sensor vars in import vars --- salt/vars/import.map.jinja | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/salt/vars/import.map.jinja b/salt/vars/import.map.jinja index 198db31dd..f9dfa0c25 100644 --- a/salt/vars/import.map.jinja +++ b/salt/vars/import.map.jinja @@ -1,10 +1,12 @@ {% from 'vars/elasticsearch.map.jinja' import ELASTICSEARCH_GLOBALS %} +{% from 'vars/sensor.map.jinja' import SENSOR_GLOBALS %} {% set ROLE_GLOBALS = {} %} {% set IMPORT_GLOBALS = [ - ELASTICSEARCH_GLOBALS + ELASTICSEARCH_GLOBALS, + SENSOR_GLOBALS ] %}