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

Merge pull request #3664 from whowutwut/remove_discovery_workaround

Browse Source 
Remove workaround for OpenBMC discovery to provide a unique discover node name
This commit is contained in:
xuweibj
2017-08-11 16:55:48 +08:00
committed by GitHub
parent 506ae0ddae fa0799c4c4
commit 5f267b7b98
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,14 +125,6 @@ sub process_request
my $request_command = shift;
$::CALLBACK = $callback;
#$::args = $request->{arg};
if (ref($request->{environment}) eq 'ARRAY' and ref($request->{environment}->[0]->{XCAT_DEV_WITHERSPOON}) eq 'ARRAY') {
$::XCAT_DEV_WITHERSPOON = $request->{environment}->[0]->{XCAT_DEV_WITHERSPOON}->[0];
} elsif (ref($request->{environment}) eq 'ARRAY') {
$::XCAT_DEV_WITHERSPOON = $request->{environment}->[0]->{XCAT_DEV_WITHERSPOON};
} else {
$::XCAT_DEV_WITHERSPOON = $request->{environment}->{XCAT_DEV_WITHERSPOON};
}
if ($request->{sn}) {
my $dhcpservers = $request->{dhcpservers};
if (!defined($dhcpservers) or ref($dhcpservers) ne 'ARRAY') {
@ -1182,10 +1174,6 @@ sub bmcdiscovery_openbmc{
if (defined($response->{data})) {
if (defined($response->{data}->{PartNumber}) and defined($response->{data}->{SerialNumber})) {
$mtm = $response->{data}->{PartNumber};
if (defined($::XCAT_DEV_WITHERSPOON) && ($::XCAT_DEV_WITHERSPOON eq "TRUE")) {
xCAT::MsgUtils->message("I", { data => ["XCAT_DEV_WITHERSPOON=TRUE, forcing MTM to empty string for $ip (Original MTM=$mtm)"] }, $::CALLBACK);
$mtm = "";
}
$serial = $response->{data}->{SerialNumber};
}