xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 03:12:30 +00:00
Code Issues Releases Wiki Activity

correct several issues on site.httpport in diskless provision (#5774)

Browse Source
This commit is contained in:
yangsong
2018-11-07 18:19:35 +08:00
committed by Bin Xu
parent 13bca11a9d
commit 01541aba74
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
xCAT-server/lib/xcat/plugins/anaconda.pm
View File

@@ -652,8 +652,7 @@ sub mknetboot
$kcmdline .= $statemnt . " ";
$kcmdline .= "XCAT=$xcatmasterip:$xcatdport ";
$kcmdline .= "XCATHTTPPORT=$httpport ";
if ($rootfstype ne "ramdisk") {
@@ -695,6 +694,8 @@ sub mknetboot
$kcmdline .= " nonodestatus ";
}
$kcmdline .= "XCATHTTPPORT=$httpport ";
if (($::XCATSITEVALS{xcatdebugmode} eq "1") or ($::XCATSITEVALS{xcatdebugmode} eq "2")) {
#for use in postscript and postbootscript in xcatdsklspost in the rootimg
$kcmdline .= " LOGSERVER=$xcatmasterip ";

3
xCAT-server/lib/xcat/plugins/debian.pm
View File

@@ -1336,8 +1336,6 @@ sub mknetboot
}
$kcmdline .=" XCATHTTPPORT=$httpport ";
# add support for subVars in the value of "statemnt"
my $statemnt = "";
if (exists($stateHash->{$node})) {
@@ -1401,6 +1399,7 @@ sub mknetboot
}
$kcmdline .=" XCATHTTPPORT=$httpport ";
if (($::XCATSITEVALS{xcatdebugmode} eq "1") or ($::XCATSITEVALS{xcatdebugmode} eq "2")) {
my ($host, $ipaddr) = xCAT::NetworkUtils->gethostnameandip($xcatmaster);

2
xCAT/postscripts/xcatdsklspost
View File

@@ -487,7 +487,7 @@ else # for common mode MODE=1,2,3,5 (updatenode,moncfg,node deployment)
SIP=`echo $TMP | cut -d: -f1`
elif [ "$KEY" = "XCATHTTPPORT" ];then
HTTPPORT=$(echo $i | awk -F= '{print $1}')
HTTPPORT=$(echo $i | awk -F= '{print $2}')
[ -z "$HTTPPORT" ] && HTTPPORT="80"
fi
done