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

FSP/BPA redundancy: do_makedhcp should check if the node itself is an IP first.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8823 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
yinle 2011-02-11 07:38:02 +00:00
parent 66117158c2
commit 19218acbc8
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xCAT-server/lib/xcat/plugins/lsslp.pm
View File

@ -2487,11 +2487,15 @@ sub do_makedhcp {
# Check if IP and mac are both
# existing for this node
#####################################
my ($hostsent) = $db{hosts}->getNodeAttribs( $name, [qw(ip)] );
if ( !$hostsent or !$hostsent->{ip} ) {
$string = "Cannot find IP address for node $name during makedhcp, skip";
send_msg( $request, 0, $string );
next;
my $ifip = xCAT::Utils->isIpaddr($name);
unless( $ifip )
{
my ($hostsent) = $db{hosts}->getNodeAttribs( $name, [qw(ip)] );
if ( !$hostsent or !$hostsent->{ip} ) {
$string = "Cannot find IP address for node $name during makedhcp, skip";
send_msg( $request, 0, $string );
next;
}
}
my ($macent) = $db{mac}->getNodeAttribs( $name, [qw(mac)] );