arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

defect 3819

Browse Source
This commit is contained in:
lissav 2013-10-10 13:42:47 -04:00
parent 410217ac31
commit b96e107a7c
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,7 @@ use strict;
my @cpiopid;
my $httpmethod="http";
my $httpport="80";
my $useflowcontrol="0";
@ -117,6 +118,7 @@ sub process_request
my $path = undef;
if ($::XCATSITEVALS{"httpmethod"}) { $httpmethod = $::XCATSITEVALS{"httpmethod"}; }
if ($::XCATSITEVALS{"httpport"}) { $httpport = $::XCATSITEVALS{"httpport"}; }
if ($::XCATSITEVALS{"useflowcontrol"}) { $useflowcontrol = $::XCATSITEVALS{"useflowcontrol"}; }
if ($request->{command}->[0] eq 'copycd')
{
@ -722,6 +724,8 @@ sub mknetboot
"imgurl=$httpmethod://$imgsrv:$httpport/$rootimgdir/rootimg.$suffix ";
$kcmdline .= "XCAT=$xcatmaster:$xcatdport ";
$kcmdline .= "NODE=$node ";
# add flow control setting
$kcmdline .= "FC=$useflowcontrol ";
}
#inform statelite/stateless node not to update the nodestatus during provision
if(($nodestatus eq "n") or ($nodestatus eq "N") or ($nodestatus eq "0")){

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

@ -22,6 +22,7 @@ use File::Copy;
use Socket;
#use strict;
my $useflowcontrol="0";
my @cpiopid;
##############################################################################
@ -129,6 +130,7 @@ sub process_request
my $distname = undef;
my $arch = undef;
my $path = undef;
if ($::XCATSITEVALS{"useflowcontrol"}) { $useflowcontrol = $::XCATSITEVALS{"useflowcontrol"}; }
if ($request->{command}->[0] eq 'copycd')
{
return copycd($request, $callback, $doreq);
@ -1362,6 +1364,8 @@ sub mknetboot
"XCAT=$xcatmaster:$xcatdport ";
$kcmdline .=
"NODE=$node ";
# add flow control setting
$kcmdline .= "FC=$useflowcontrol ";
# BEGIN service node
my $isSV = xCAT::Utils->isServiceNode();
my $res = xCAT::Utils->runcmd("hostname", 0);
@ -1382,6 +1386,10 @@ sub mknetboot
$kcmdline =
"imgurl=http://$imgsrv/$rootimgdir/rootimg.$suffix ";
$kcmdline .= "XCAT=$xcatmaster:$xcatdport ";
$kcmdline .=
"NODE=$node ";
# add flow control setting
$kcmdline .= "FC=$useflowcontrol ";
}
# if site.nodestatus='n', add "nonodestatus" to kcmdline to inform the node not to update nodestatus during provision

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

@ -23,6 +23,7 @@ use File::Copy;
use File::Temp qw/mkdtemp/;
my $httpmethod = "http";
my $httpport = "80";
my $useflowcontrol="0";
use File::Find;
use File::Basename;
use Digest::MD5 qw(md5_hex);
@ -575,6 +576,9 @@ sub mknetboot
}
$kcmdline .= "NODE=$node ";
# add flow control setting
$kcmdline .= "FC=$useflowcontrol ";
# add the kernel-booting parameter: netdev=<eth0>, or BOOTIF=<mac>
my $netdev = "";
@ -679,6 +683,7 @@ sub process_request
my $path = undef;
if ($::XCATSITEVALS{"httpmethod"}) { $httpmethod = $::XCATSITEVALS{"httpmethod"}; }
if ($::XCATSITEVALS{"httpport"}) { $httpport = $::XCATSITEVALS{"httpport"}; }
if ($::XCATSITEVALS{"useflowcontrol"}) { $useflowcontrol = $::XCATSITEVALS{"useflowcontrol"}; }
if ($request->{command}->[0] eq 'copycd')
{
return copycd($request, $callback, $doreq);