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

not set the hidden att for ngp; fix the cmm slot-> eth_fsp mapping

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11375 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
daniceexi 2012-01-13 08:19:43 +00:00
parent 9c35bb6aea
commit 1f6cb219ae
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1515,7 +1515,6 @@ sub rscan {
$k3->{node} = $name;
if ($type eq "fsp") {
$u3->{groups} = "fsp,all";
$u3->{hidden} = "1";
} elsif ($type eq "ppcblade") {
$u3->{groups} = "blade,all";
} else {
@ -1636,10 +1635,6 @@ sub rscan_xml {
$href->{Node}->{$_} = $d;
}
}
# Specific values for fsp
if ($type eq 'fsp') {
$href->{Node}->{'hidden'} = "1";
}
$xml.= XMLout($href,NoAttr=>1,KeyAttr=>[],RootName=>undef);
}
@ -1727,11 +1722,6 @@ sub rscan_stanza {
$result .= "\t$_=$d\n";
}
}
# Specific values for fsp
if ($type eq 'fsp') {
$result .= "\thidden=1\n";
}
}
return( $result );
}
@ -4109,7 +4099,13 @@ sub rscanfsp {
# mm[1] -> eth1; mm[2] -> eth0;
my $ifside;
if ($mm =~ /\[(\d)\]/) {
$ifside = $1;
if ($1 eq "1") {
$ifside = "1";
} elsif ($1 eq "2") {
$ifside = "0";
} else {
$ifside = $1;
}
}
foreach (@blade) {
/blade\[(\d+)\]/;
@ -4201,9 +4197,16 @@ sub network {
# The network setting for the service processor of blade
my @data = $t->cmd("ifconfig -T system:blade[$slot]");
# get the active interface
# MM[1] - FSP eth1 MM[2] - FSP eth0
my $if;
if ($mm =~ /\[(\d)\]/) {
$if = "eth".$1;
if($1 eq "1") {
$if = "eth1";
} elsif($1 eq "2") {
$if = "eth0";
} else {
$if = "eth".$1;
}
} else {
foreach (@data) {
if (/eth(\d)/) { $if = "eth".$1; last;}