xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-15 10:50:28 +00:00
Code Issues Releases Wiki Activity

Deal with hostname which is alias of the predefined node

Browse Source
This commit is contained in:
ertaozh
2016-07-31 22:58:47 -04:00
parent 13fa0118b6
commit 4efa05ddb5
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,15 +285,15 @@ sub process_request {
my $ipn = unpack("N", inet_aton($ip));
my $mask = 2**$netbits - 1 << (32 - $netbits);
my $netn = inet_ntoa(pack("N", $ipn & $mask));
my $hosttag;
if ($usednames_for_net{$netn}) {
$hosttag = $usednames_for_net{$netn};
if ($hosttag eq $node) {
$hosttag .= "-$ifinfo[1]";
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;
}
} else {
$hosttag = gethosttag($node, $netn, @ifinfo[1], \%usednames);
}
print Dumper($hosttag) . "\n";
if ($hosttag) {