xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-17 03:40:39 +00:00
Code Issues Releases Wiki Activity

fix error 4989: The error message of bmcdiscover is disordered when it hit database problem

Browse Source
This commit is contained in:
ertaozh
2018-03-22 02:13:46 -04:00
parent 48e0e8eba8
commit 56b926afaa
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1053,7 +1053,7 @@ sub bmcdiscovery_ipmi {
if ($output =~ $bmcstr) {
store_fd({data=>1}, $fd);
if ($output =~ /RAKP 2 message indicates an error : (.+)\nError: (.+)/) {
if ($output =~ /RAKP \d+ message indicates an error : (.+)\nError: (.+)/) {
xCAT::MsgUtils->message("W", { data => ["$2: $1 for $ip"] }, $::CALLBACK);
return;
}
@ -1127,6 +1127,9 @@ sub bmcdiscovery_ipmi {
} elsif ($output =~ /RAKP \S* \S* is invalid/) {
xCAT::MsgUtils->message("W", { data => ["BMC password is incorrect for $ip"] }, $::CALLBACK);
return;
} else {
xCAT::MsgUtils->message("W", { data => ["Unknown error get from $ip"] }, $::CALLBACK);
return;
}
display_output($opz,$opw,$mtms_node,$mac_node,$node_data,"ipmi",$request_command);