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

remove check for site.master when determining image server. Does not work for servicenode pools. Final check for my_ip_facing should cover the site.master image server when needed

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2881 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav
2009-03-12 16:34:54 +00:00
parent 42c37fc4d5
commit 7a232d81c4
2 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -280,7 +280,7 @@ sub mknetboot
# ['serialport', 'serialspeed', 'serialflow']);
# determine image server, if tftpserver use it, else use xcatmaster
# else use site.Master, last resort use self
# last resort use self
my $imgsrv;
my $ient;
$ient = $reshash->{$node}->[0]; #$restab->getNodeAttribs($node, ['tftpserver']);
@@ -297,20 +297,21 @@ sub mknetboot
}
else
{
$ient = $sitetab->getAttribs({key => master}, value);
if ($ient and $ient->{value})
# master not correct for service node pools
#$ient = $sitetab->getAttribs({key => master}, value);
#if ($ient and $ient->{value})
#{
# $imgsrv = $ient->{value};
#}
#else
#{
my $ipfn = xCAT::Utils->my_ip_facing($node);
if ($ipfn)
{
$imgsrv = $ient->{value};
}
else
{
my $ipfn = xCAT::Utils->my_ip_facing($node);
if ($ipfn)
{
$imgsrv = $ipfn; #guessing self is second best
}
}
#}
}
}
unless ($imgsrv)

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

@@ -139,7 +139,7 @@ sub mknetboot
['serialport', 'serialspeed', 'serialflow']);
# determine image server, if tftpserver use it, else use xcatmaster
# else use site.Master, last resort use self
# last resort use self
my $imgsrv;
my $ient;
$ient = $restab->getNodeAttribs($node, ['tftpserver']);
@@ -156,20 +156,21 @@ sub mknetboot
}
else
{
$ient = $sitetab->getAttribs({key => master}, value);
if ($ient and $ient->{value})
# master removed, does not work for servicenode pools
#$ient = $sitetab->getAttribs({key => master}, value);
#if ($ient and $ient->{value})
#{
# $imgsrv = $ient->{value};
#}
#else
#{
my $ipfn = xCAT::Utils->my_ip_facing($node);
if ($ipfn)
{
$imgsrv = $ient->{value};
}
else
{
my $ipfn = xCAT::Utils->my_ip_facing($node);
if ($ipfn)
{
$imgsrv = $ipfn; #guessing self is second best
$imgsrv = $ipfn; #guessing self is second best
}
}
#}
}
}
unless ($imgsrv)