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

defect 4657: PCM has requirement that the user/password of fsp are different with the ones of ipmi for ppcle node. That means our renergy command should read 'passwd:fsp' first, if it does not exist, then use the default passwd 'admin/admin' instead of use the password from ipmi.

Browse Source
This commit is contained in:
WangXiaoPeng
2015-04-28 08:31:18 -04:00
parent c9488a9192
commit d6feb34e0c
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
xCAT-server/lib/xcat/plugins/energy.pm
View File

@ -336,6 +336,13 @@ sub process_request {
$nodehm_hash = $nodehm_tab->getNodesAttribs($request->{node}, ['mgt']);
}
# get the 'fsp' key from the passwd table
my $passwd_tab = xCAT::Table->new('passwd', -create => 0);
my $passwd_hash;
if ($passwd_tab) {
$passwd_hash = $passwd_tab->getAttribs({key=>'fsp'},qw(username password));
}
my $ppcdirect_tab = xCAT::Table->new('ppcdirect', -create=>0);
my $children; # The number of child process
@ -399,9 +406,11 @@ sub process_request {
if (defined ($ipmi_hash->{$node}->[0]->{bmc})){
# This is a ipmi managed node. (should be a ppcle)
$hcp_ip = $ipmi_hash->{$node}->[0]->{bmc};
if (defined ($ipmi_hash->{$node}->[0]->{username})){
$user = $ipmi_hash->{$node}->[0]->{username};
$password = $ipmi_hash->{$node}->[0]->{password};
# Get the passwd from passwd table for 'fsp' first, if not the default will be used
if (defined($passwd_hash->{username}) && defined($passwd_hash->{password})) {
$user = $passwd_hash->{username};
$password = $passwd_hash->{password};
}
} else {
xCAT::MsgUtils->message("E", {data => ["$node: Missed attribute [bmc]."]}, $callback);