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

Fix bug 3451003:xcatsetup can't work with some kinds of host-name

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11124 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
yinle 2011-12-05 09:12:15 +00:00
parent e13da2b82a
commit 48d5b1759d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xCAT-server/lib/xcat/plugins/setup.pm
View File

@ -1156,9 +1156,11 @@ sub writelpar {
#my $cecsperbb = $STANZAS{'xcat-building-blocks'}->{'num-cecs-per-bb'};
#if ($cecsperbb !~ /^\d+$/) { errormsg("invalid non-integer value for num-cecs-per-bb: $cecsperbb", 7); return 0; }
for (my $b=1; $b<=$numbbs; $b++) {
my $framebase = ($b-1) * $framesperbb + 1;
findSNsinBB('service', $b, $framebase, $rangeparts, \%servicenodes, \%lpars) or return 0;
findSNsinBB('storage', $b, $framebase, $rangeparts, \%storagenodes) or return 0;
#my $framebase = ($b-1) * $framesperbb + 1;
#findSNsinBB('service', $b, $framebase, $rangeparts, \%servicenodes, \%lpars) or return 0;
#findSNsinBB('storage', $b, $framebase, $rangeparts, \%storagenodes) or return 0;
findSNsinBB('service', $b, $rangeparts, \%servicenodes, \%lpars) or return 0;
findSNsinBB('storage', $b, $rangeparts, \%storagenodes) or return 0;
}
if (scalar(keys(%servicenodes))) {
$tables{'nodelist'}->setNodesAttribs(\%servicenodes);
@ -1181,7 +1183,8 @@ sub writelpar {
# Find either service nodes or storage nodes in a BB. Adds the nodenames of the lpars to the snodes hash,
# and defines the groups in the hash, and assigns the other lpars to the correct service node.
sub findSNsinBB {
my ($sntext, $bb, $framebase, $rangeparts, $snodes, $lpars) = @_;
#my ($sntext, $bb, $framebase, $rangeparts, $snodes, $lpars) = @_;
my ($sntext, $bb, $rangeparts, $snodes, $lpars) = @_;
my $primbase = $$rangeparts{'primary-base'};
my $primlen = length($$rangeparts{'primary-start'});
my $secbase = $$rangeparts{'secondary-base'};
@ -1197,6 +1200,9 @@ sub findSNsinBB {
if (scalar(@snpositions) != $snsperbb) { errormsg("invalid number of positions specified for xcat-$sntext-nodes:cec-positions-in-bb.", 3); return 0; }
my $cecsperframe = $STANZAS{'xcat-cecs'}->{'num-cecs-per-frame'}; # they may have specified this instead of a supernode-list, which would fill in NUMCECSINFRAME
my @snsinbb;
my $framerange = $STANZAS{'xcat-frames'}->{'hostname-range'};
my $framename = parsenoderange($framerange);
my $framebase = $$framename{'primary-start'};
foreach my $p (@snpositions) {
my $cecbase = 0;
my $frame = $framebase;