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

fix issue 5617, show existed node info when bmcdiscover -z (#5619)

Browse Source
This commit is contained in:
xuweibj
2018-09-11 16:34:21 +08:00
committed by Bin Xu
parent fdd5772c5b
commit ce76aa18e9
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1175,6 +1175,10 @@ sub bmcdiscovery_ipmi {
if (exists($::VPDHASH{$mtmsip})) {
my $pre_node = $::VPDHASH{$mtmsip};
xCAT::MsgUtils->message("I", { data => ["Found match node $pre_node with bmc ip address: $ip, rsetboot/rpower $pre_node to continue hardware discovery."] }, $::CALLBACK);
if ($opz) {
$node_data .= ",";
display_output($opz,undef,$pre_node,$mac_node,$node_data,"ipmi",$request_command);
}
return;
}
$mtms_node = "node-$mtm-$serial";
@@ -1304,6 +1308,10 @@ sub bmcdiscovery_openbmc{
if (exists($::VPDHASH{$mtmsip})) {
my $pre_node = $::VPDHASH{$mtmsip};
xCAT::MsgUtils->message("I", { data => ["Found match node $pre_node with bmc ip address: $ip, rsetboot/rpower $pre_node to continue hardware discovery."] }, $::CALLBACK);
if ($opz) {
$node_data .= ",";
display_output($opz,undef,$pre_node,$mac_node,$node_data,"openbmc",$request_command);
}
return;
}
$mtms_node = "node-$mtm-$serial";