Merge pull request #5627 from Security-Onion-Solutions/80soup

ignore manager pillar file for noderoutetype
This commit is contained in:
Mike Reeves
2021-09-22 12:03:55 -04:00
committed by GitHub

View File

@@ -644,9 +644,14 @@ up_2.3.5X_to_2.3.80() {
sed -i '/ esclustername/d' /opt/so/saltstack/local/pillar/global.sls sed -i '/ esclustername/d' /opt/so/saltstack/local/pillar/global.sls
for file in /opt/so/saltstack/local/pillar/minions/*.sls; do for file in /opt/so/saltstack/local/pillar/minions/*.sls; do
noderoutetype=$(grep -w node_route_type $file | awk -F: {'print $2'}) if [[ ${file} != *"manager.sls"* ]]; then
sed -i "/^elasticsearch:/a \\ config: \n node: \n attr: \n box_type: $noderoutetype" $file noderoutetype=$(grep -w node_route_type $file | awk -F: {'print $2'})
sed -i '/ node_route_type/d' $file if [ -n "$noderoutetype" ]; then
sed -i "/^elasticsearch:/a \\ config: \n node: \n attr: \n box_type: $noderoutetype" $file
sed -i '/ node_route_type/d' $file
noderoutetype=''
fi
fi
done done
fi fi