diff --git a/pillar/data/addtotab.sh b/pillar/data/addtotab.sh index 2b696a067..a605bdb14 100644 --- a/pillar/data/addtotab.sh +++ b/pillar/data/addtotab.sh @@ -5,12 +5,18 @@ TYPE=$1 NAME=$2 IPADDRESS=$3 +MANINT=$4 +MONINT=$5 if grep -q $IPADDRESS "/opt/so/saltstack/pillar/data/$1.sls"; then echo "Node Already Present" else echo " $NAME:" >> /opt/so/saltstack/pillar/data/$1.sls echo " ip: $IPADDRESS" >> /opt/so/saltstack/pillar/data/$1.sls + if [ $TYPE == 'sensorstab' ]; then + echo " manint: $MANINT" >> /opt/so/saltstack/pillar/data/$1.sls + echo " monint: $MONINT" >> /opt/so/saltstack/pillar/data/$1.sls + fi salt-call state.apply utility fi diff --git a/so-setup-network.sh b/so-setup-network.sh index 13bda7272..c01be1f9d 100644 --- a/so-setup-network.sh +++ b/so-setup-network.sh @@ -739,7 +739,7 @@ set_initial_firewall_policy() { if [ $INSTALLTYPE == 'SENSORONLY' ]; then ssh -i /root/.ssh/so.key socore@$MSRV sudo /opt/so/saltstack/pillar/firewall/addfirewall.sh minions $MAINIP ssh -i /root/.ssh/so.key socore@$MSRV sudo /opt/so/saltstack/pillar/firewall/addfirewall.sh forward_nodes $MAINIP - ssh -i /root/.ssh/so.key socore@$MSRV sudo /opt/so/saltstack/pillar/data/addtotab.sh sensorstab $HOSTNAME $MAINIP + ssh -i /root/.ssh/so.key socore@$MSRV sudo /opt/so/saltstack/pillar/data/addtotab.sh sensorstab $HOSTNAME $MAINIP $MAININT bond0 fi if [ $INSTALLTYPE == 'STORAGENODE' ]; then