xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 11:22:27 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1601 from zet809/support_bond_for_hdwr_discovery

Browse Source 
Deal with the scenario that more than 1 nic connecting to the provisi…
This commit is contained in:
Xiaopeng Wang
2016-08-01 14:05:20 +08:00
committed by GitHub
parent 55230ec124 4efa05ddb5
commit 2deffa2e7e
1 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
xCAT-server/lib/xcat/plugins/nodediscover.pm
View File

@@ -246,6 +246,8 @@ sub process_request {
my $mactab = xCAT::Table->new("mac", -create => 1);
my @ifinfo;
my %usednames;
my %usednames_for_net;
my @hostnames_to_update = ();
my %bydriverindex;
my $forcenic = 0; #-1 is force skip, 0 is use default behavior, 1 is force to be declared even if hosttag is skipped to do so
foreach (@{ $request->{mac} }) {
@@ -284,9 +286,19 @@ sub process_request {
my $mask = 2**$netbits - 1 << (32 - $netbits);
my $netn = inet_ntoa(pack("N", $ipn & $mask));
my $hosttag = gethosttag($node, $netn, @ifinfo[1], \%usednames);
unless ($hosttag) {
my $nettagname = $usednames_for_net{$netn};
# For nics not in the install network, don't deal with them if not an avaliable hostname get
# In case another nic in install network get a hosttag other than nodename, need to compare the IP address they can convert to
if ($nettagname and (inet_aton($nettagname) eq inet_aton($node))) {
$hosttag = "$node-$ifinfo[1]";
push @hostnames_to_update, $hosttag;
}
}
print Dumper($hosttag) . "\n";
if ($hosttag) {
$usednames{$hosttag} = 1;
$usednames_for_net{$netn} = $hosttag;
if ($hosttag eq $node) {
$macstring .= $currmac . "|";
} else {
@@ -308,6 +320,25 @@ sub process_request {
}
$macstring =~ s/\|\z//;
$mactab->setNodeAttribs($node, { mac => $macstring });
if (scalar @hostnames_to_update) {
my $hosttab = xCAT::Table->new('hosts');
if ($hosttab) {
my ($ent) = $hosttab->getNodeAttribs($node, ['hostnames']);
if ($ent and $ent->{hostnames}) {
my @hostnames_array = split /,/, $ent->{hostnames};
push @hostnames_to_update,@hostnames_array;
}
my %allhostnames = map { $_=>1 } @hostnames_to_update;
my $hostnames = join(",", (keys %allhostnames));
$hosttab->setNodeAttribs($node, { hostnames => $hostnames });
$hosttab->commit();
}
my %request = (
command => ['makehosts'],
node => [$node]
);
$doreq->(\%request);
}
my %request = (
command => ['makedhcp'],
node => [$node]