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

Have ks= in esxi install honor noderes.nfsserver

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@12537 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2012-05-04 21:04:54 +00:00
parent a47b354c3e
commit 02ee2e25d9
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xCAT-server/lib/xcat/plugins/esx.pm
View File

@ -4351,7 +4351,7 @@ sub mkcommonboot {
my $restab = xCAT::Table->new('noderes',-create=>0);
my $resents;
if ($restab) {
$resents = $restab->getNodesAttribs(\@nodes,['tftpdir']);
$resents = $restab->getNodesAttribs(\@nodes,['tftpdir','nfsserver']);
}
my %tablecolumnsneededforaddkcmdline;
@ -4380,6 +4380,13 @@ sub mkcommonboot {
my $profile = $ent->{'profile'};
my $osver = $ent->{'os'};
my $tftpdir;
my $ksserver;
if ($resents and $resents->{$node}->[0]->{nfsserver}) {
$ksserver=$resents->{$node}->[0]->{nfsserver};
} else {
$ksserver='!myipfn!';
}
if ($resents and $resents->{$node}->[0]->{tftpdir}) {
$tftpdir = $resents->{$node}->[0]->{tftpdir};
} else {
@ -4506,7 +4513,7 @@ sub mkcommonboot {
$append = "-c $tp/boot.cfg.$bootmode";
}
if ($bootmode eq "install") {
$append .= " ks=http://!myipfn!/install/autoinst/$node";
$append .= " ks=http://$ksserver/install/autoinst/$node";
esxi_kickstart_from_template(node=>$node,os=>$osver,arch=>$arch,profile=>$profile);
}
if ($bootmode ne "install" and $serialconfig->{$node}) { #don't do it for install, installer croaks currently