xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-07-01 18:35:36 +00:00
Code Issues Releases Wiki Activity

Remove trailing spaces in file xCAT-server/lib/xcat/plugins/nodediscover.pm

Browse Source
This commit is contained in:
GONG Jie
2017-12-31 23:59:59 +00:00
parent b7603c7877
commit 9810da03b6
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

@ -236,9 +236,9 @@ sub process_request {
$nrtab->setNodeAttribs($node, { netboot => 'petitboot' });
} elsif ($request->{arch}->[0] =~ /ppc/ and $currboot !~ /yaboot/) {
$nrtab->setNodeAttribs($node, { netboot => 'yaboot' });
} elsif($request->{arch}->[0] =~ /armv7l/ and $currboot !~ /onie/) {
} elsif($request->{arch}->[0] =~ /armv7l/ and $currboot !~ /onie/) {
#for onie switch, the netboot should be "onie"
$nrtab->setNodeAttribs($node, { netboot => 'onie' });
$nrtab->setNodeAttribs($node, { netboot => 'onie' });
}
}
@ -254,14 +254,14 @@ sub process_request {
$switchtype=$xCAT::data::switchinfo::global_switch_type{$1};
}
}
if($switchtype){
$switchestab->setNodeAttribs($node,{ switchtype => $switchtype });
}
$switchestab->close();
}
}
my $macstring = "";
if (defined($request->{mac})) {
@ -319,7 +319,7 @@ sub process_request {
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 available hostname get
# For nics not in the install network, don't deal with them if not an available 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]";
@ -461,7 +461,7 @@ sub process_request {
if (defined($request->{bmc_node}) and defined($request->{bmc_node}->[0])) {
$bmc_node = $request->{bmc_node}->[0];
}
if (-x "/usr/bin/goconserver") {
xCAT::MsgUtils->message("S", "xcat.discovery.nodediscover: remove gocons session for $bmc_node");
require xCAT::Goconserver;
@ -496,7 +496,7 @@ sub process_request {
}
}
}
my $restartstring = "restart";
if (scalar @forcenics > 0) {