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

Prepare to have http/https switchable and non-default http ports

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13128 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2012-06-19 20:17:42 +00:00
parent 8434c0932e
commit 62507fbe0e
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,8 @@ use Socket;
use strict;
my @cpiopid;
my $httpmethod="http";
my $httpport="80";
@ -548,7 +550,7 @@ sub mknetboot
$kcmdline = "NFSROOT=$nfssrv:$nfsdir STATEMNT=";
}
} else {
$kcmdline = "imgurl=http://$imgsrv/$rootimgdir/rootimg-statelite.gz STATEMNT=";
$kcmdline = "imgurl=$httpmethod://$imgsrv:$httpport/$rootimgdir/rootimg-statelite.gz STATEMNT=";
}
# add support for subVars in the value of "statemnt"
@ -608,7 +610,7 @@ sub mknetboot
}
else {
$kcmdline =
"imgurl=http://$imgsrv/$rootimgdir/rootimg.$suffix ";
"imgurl=$httpmethod://$imgsrv:$httpport/$rootimgdir/rootimg.$suffix ";
$kcmdline .= "XCAT=$xcatmaster:$xcatdport ";
}
@ -1099,8 +1101,8 @@ sub mkinstall
$instserver=$ent->{nfsserver};
}
my $kcmdline =
"quiet repo=http://$instserver/install/$os/$arch/ ks=http://"
. $instserver
"quiet repo=$httpmethod://$instserver:$httpport/install/$os/$arch/ ks=$httpmethod://"
. $instserver . ":". $httpport
. "/install/autoinst/"
. $node;
if ($maxmem) {

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

@ -20,6 +20,8 @@ Getopt::Long::Configure("pass_through");
use File::Path;
use File::Copy;
use File::Temp qw/mkdtemp/;
my $httpmethod = "http";
my $httpport = "80";
use Socket;
@ -420,7 +422,7 @@ sub mknetboot
"NFSROOT=$nfssrv:$nfsdir STATEMNT=";
} else {
$kcmdline =
"imgurl=http://$imgsrv/$rootimgdir/rootimg-statelite.gz STATEMNT=";
"imgurl=$httpmethod://$imgsrv/$rootimgdir/rootimg-statelite.gz STATEMNT=";
}
# add support for subVars in the value of "statemnt"
my $statemnt="";
@ -467,7 +469,7 @@ sub mknetboot
else
{
$kcmdline =
"imgurl=http://$imgsrv/$rootimgdir/rootimg.$suffix ";
"imgurl=$httpmethod://$imgsrv/$rootimgdir/rootimg.$suffix ";
}
$kcmdline .= "XCAT=$xcatmaster:$xcatdport quiet ";
@ -837,11 +839,11 @@ sub mkinstall
$netserver = $ent->{nfsserver};
}
my $kcmdline =
"quiet autoyast=http://"
"quiet autoyast=$httpmethod://"
. $netserver
. "$installroot/autoinst/"
. $node
. " install=http://"
. " install=$httpmethod://"
. $netserver
. "$pkgdir/1";