Ensure SENSOR_CHECKIN_INTERVAL_MS var is non-null before saving static pillar

This commit is contained in:
Jason Ertel
2020-07-23 21:00:10 -04:00
parent bb6871a54a
commit 39426afffd

View File

@@ -926,13 +926,6 @@ manager_pillar() {
local pillar_file=$temp_install_dir/pillar/minions/$MINION_ID.sls local pillar_file=$temp_install_dir/pillar/minions/$MINION_ID.sls
if [ -z "$SENSOR_CHECKIN_INTERVAL_MS" ]; then
SENSOR_CHECKIN_INTERVAL_MS=10000
if [ "$install_type" = 'EVAL' ] || [ "$install_type" = 'STANDALONE' ]; then
SENSOR_CHECKIN_INTERVAL_MS=1000
fi
fi
# Create the manager pillar # Create the manager pillar
printf '%s\n'\ printf '%s\n'\
"manager:"\ "manager:"\
@@ -1003,6 +996,13 @@ manager_pillar() {
manager_static() { manager_static() {
local static_pillar="$local_salt_dir/pillar/static.sls" local static_pillar="$local_salt_dir/pillar/static.sls"
if [ -z "$SENSOR_CHECKIN_INTERVAL_MS" ]; then
SENSOR_CHECKIN_INTERVAL_MS=10000
if [ "$install_type" = 'EVAL' ] || [ "$install_type" = 'STANDALONE' ]; then
SENSOR_CHECKIN_INTERVAL_MS=1000
fi
fi
# Create a static file for global values # Create a static file for global values
printf '%s\n'\ printf '%s\n'\
"static:"\ "static:"\