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

fix noderegenips generate conflict ips

Browse Source
This commit is contained in:
Jia Zhao 2014-06-18 13:38:05 +08:00
parent c47c9ac1ca
commit cad677f29a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -761,7 +761,7 @@ Usage:
}
# make sure there are something changed, otherwise we should quit without any changes.
unless ($changeflag){
setrsp_errormsg("No profile changes detect.");
setrsp_infostr("Warning: no profile changes detect.");
return;
}
@ -931,11 +931,15 @@ Usage:
#6. Generate new free IPs for each network.
my @allknownips = keys %allips;
my %netFreeIPsHash = ();
foreach my $updnic (@updateNics){
#No need generate for removed nics.
unless (grep {$_ eq $updnic} @removedNics){
my $netname = $netProfileNicsRef->{$netProfileName}->{$updnic}->{"network"};
$freeIPsHash{$updnic} = xCAT::ProfiledNodeUtils->get_allocable_staticips_innet($netname, \@allknownips);
if ( not exists $netFreeIPsHash{$netname} ){
$netFreeIPsHash{$netname} = xCAT::ProfiledNodeUtils->get_allocable_staticips_innet($netname, \@allknownips);
}
$freeIPsHash{$updnic} = $netFreeIPsHash{$netname};
}
}