2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 09:13:08 +00:00

NODE attribute didn't populate in /opt/xcat/xcatinfo after reboot (#4428)

* NODE attribute didn't populate in /opt/xcat/xcatinfo after reboot

* Get NODE from mypostscripts
This commit is contained in:
cxhong 2017-12-13 09:33:17 -05:00 committed by yangsong
parent af7bfe8489
commit b579154b80

View File

@ -24,6 +24,7 @@
if [ -f /xcatpost/mypostscript.post ]; then
XCATDEBUGMODE=`grep 'XCATDEBUGMODE=' /xcatpost/mypostscript.post | cut -d= -f2 | tr -d \'\" | tr A-Z a-z`
MASTER_IP=`grep '^MASTER_IP=' /xcatpost/mypostscript.post |cut -d= -f2|sed s/\'//g`
NODE=`grep '^NODE=' /xcatpost/mypostscript.post |cut -d= -f2|sed s/\'//g`
else
for param in `cat /proc/cmdline`; do
key=`echo $param|awk -F= '{print $1}'`
@ -381,6 +382,9 @@ else # for common mode MODE=1,2,3,5 (updatenode,moncfg,node deployment)
break
fi
done
if [ -z "$NODE" ]; then
NODE=`hostname -s`
fi
grep 'NODE' /opt/xcat/xcatinfo > /dev/null 2>&1
if [ $? -eq 0 ]; then
sed -i "s/NODE=.*/NODE=$NODE/" /opt/xcat/xcatinfo
@ -679,15 +683,15 @@ if [ -n "$useflowcontrol" ]; then
else
new_fc="NO"
fi
grep 'USEFLOWCONTROL' /opt/xcat/xcatinfo > /dev/null 2>&1
if [ $? -eq 0 ]; then
sed -i "s/USEFLOWCONTROL=.*/USEFLOWCONTROL=$new_fc/" /opt/xcat/xcatinfo
else
echo "USEFLOWCONTROL=$new_fc" >> /opt/xcat/xcatinfo
fi
# no setting means do not use flowcontrol
else
echo "USEFLOWCONTROL=NO" >> /opt/xcat/xcatinfo
new_fc="NO"
fi
grep 'USEFLOWCONTROL' /opt/xcat/xcatinfo > /dev/null 2>&1
if [ $? -eq 0 ]; then
sed -i "s/USEFLOWCONTROL=.*/USEFLOWCONTROL=$new_fc/" /opt/xcat/xcatinfo
else
echo "USEFLOWCONTROL=$new_fc" >> /opt/xcat/xcatinfo
fi
# Store the SERVICEGROUP into the xcatinfo file for node deployment, and also for updatenode -s
@ -719,6 +723,9 @@ if [ "$MODE" = "1" ] || [ "$MODE" = "2" ]; then
mkdir -p /opt/xcat
touch /opt/xcat/xcatinfo
fi
if [ -z "$NODE" ]; then
NODE=`hostname -s`
fi
grep 'NODE' /opt/xcat/xcatinfo > /dev/null 2>&1
if [ $? -eq 0 ]; then
sed -i "s/NODE=.*/NODE=$NODE/" /opt/xcat/xcatinfo