arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change argument name in preparation for refactor of setupIMM for common use between slpdiscover and remoteimmsetup

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14483 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso
2012-11-29 20:54:12 +00:00
parent 160c635296
commit cc2148cedd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -197,14 +197,14 @@ sub process_request {
sub setupIMM {
my $node = shift;
my %args = @_;
my $slpdata = $args{slpdata};
my $nodedata = $args{nodedata};
my $ipmitab = xCAT::Table->new('ipmi',-create=>1);
my $ient = $ipmitab->getNodeAttribs($node,[qw/bmc bmcid/],prefetchcache=>1);
my $ipmiauthmap = xCAT::PasswordUtils::getIPMIAuth(noderange=>[$node]);
my $newaddr;
if ($ient) {
my $bmcid=$ient->{bmcid};
if ($bmcid and $slpdata->{macaddress} =~ /$bmcid/) {
if ($bmcid and $nodedata->{macaddress} =~ /$bmcid/) {
sendmsg("The IMM has been configured (ipmi.bmcid). Skipped.",$callback, $node);
return;
} #skip configuration, we already know this one
@@ -258,7 +258,7 @@ sub setupIMM {
}
}
$ssh->close();
$ipmitab->setNodeAttribs($node,{bmcid=>$slpdata->{macaddress}});
$ipmitab->setNodeAttribs($node,{bmcid=>$nodedata->{macaddress}});
}
exit(0);
}
@@ -280,7 +280,7 @@ sub configure_hosted_elements {
}
if ($doneaddrs{$node}) { next; }
$doneaddrs{$node}=1;
setupIMM($node,slpdata=>$immdata,curraddr=>$addr,cliusername=>$user,clipassword=>$pass);
setupIMM($node,nodedata=>$immdata,curraddr=>$addr,cliusername=>$user,clipassword=>$pass);
} else {
sendmsg(": Ignoring target in bay $slot, no node found with mp.mpa/mp.id matching",$callback,$cmm);
}