Merge branch 'dev' into foxtrot

This commit is contained in:
William Wernert
2021-03-09 10:11:04 -05:00
46 changed files with 137 additions and 281 deletions

View File

@@ -612,16 +612,6 @@ if [ $is_airgap -eq 0 ]; then
else
update_registry
update_docker_containers "soup"
FEATURESCHECK=$(lookup_pillar features elastic)
if [[ "$FEATURESCHECK" == "True" ]]; then
TRUSTED_CONTAINERS=(
"so-elasticsearch"
"so-filebeat"
"so-kibana"
"so-logstash"
)
update_docker_containers "features" "-features"
fi
fi
echo ""
echo "Stopping Salt Minion service."