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

fix bug 3502 rspconfig support for USERID=<password> for CMM in genesis case

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16003 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
zhaoertao
2013-04-17 07:21:28 +00:00
parent 233b2bf351
commit 7ec6aaf2ee
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4497,13 +4497,16 @@ sub clicmds {
my $curraddr = $mpa;
if ($args{curraddr}) {
$curraddr = $args{curraddr};
} elsif (defined($handled{'initnetwork'})) {
} elsif (defined($handled{'initnetwork'}) or defined($handled{'USERID'})) {
# get the IP of mpa from the hosts.otherinterfaces
my $hoststab = xCAT::Table->new('hosts');
if ($hoststab) {
my $hostdata = $hoststab->getNodeAttribs($node, ['otherinterfaces']);
if (!$hostdata->{'otherinterfaces'}) {
return ([1,\@unhandled,"Cannot find the temporary IP from the hosts.otherinterfaces"]);
if (!defined($handled{'USERID'})) {
push @cfgtext, "Cannot find the temporary IP from the hosts.otherinterfaces";
return ([1,\@unhandled,""]);
}
} else {
$curraddr = $hostdata->{'otherinterfaces'};
}
@@ -4638,6 +4641,14 @@ sub clicmds {
}
if (!defined($result)) {next;}
push @data, "$_: @$result";
if (/^initnetwork$/) {
if (!@$result[0]) {
my $hoststab = xCAT::Table->new('hosts');
if ($hoststab) {
$hoststab->setNodeAttribs($mpa, {otherinterfaces=>''});
}
}
}
$Rc |= shift(@$result);
push @cfgtext,@$result;
}