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

Fixed the problem which adding lpars into dhcpsd.cnf with makedhcp command. lpar os deployment should be handled by NIM

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11137 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz 2011-12-06 13:18:46 +00:00
parent d9a1e5441b
commit 21df4284a0
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
xCAT-server/lib/xcat/plugins/dhcp.pm
View File

@ -737,10 +737,10 @@ sub preprocess_request
my $ntable = xCAT::Table->new('nodetype');
if ($ntable) {
my $mytype = $ntable->getNodeAttribs($n,['nodetype']);
if ($mytype =~ /osi/) {
if ($mytype->{nodetype} =~ /osi/) {
$Imsg++;
}
unless ($mytype =~ /osi/) {
unless ($mytype->{nodetype} =~ /osi/) {
push @tmplist, $n;
}
}
@ -787,20 +787,23 @@ sub preprocess_request
}
}
} else { #send the request to every dhservers
@requests = ({%$req}); #Start with a straight copy to reflect local instance
unless ($localonly) {
my @sn = xCAT::Utils->getSNList('dhcpserver');
if (@sn > 0) { $hasHierarchy=1; }
if (@nodes > 0) {
$req->{'node'}=\@nodes;
@requests = ({%$req}); #Start with a straight copy to reflect local instance
unless ($localonly) {
my @sn = xCAT::Utils->getSNList('dhcpserver');
if (@sn > 0) { $hasHierarchy=1; }
foreach my $s (@sn)
{
if (scalar @nodes == 1 and $nodes[0] eq $s) { next; }
my $reqcopy = {%$req};
$reqcopy->{'_xcatdest'} = $s;
$reqcopy->{_xcatpreprocessed}->[0] = 1;
push @requests, $reqcopy;
foreach my $s (@sn)
{
if (scalar @nodes == 1 and $nodes[0] eq $s) { next; }
my $reqcopy = {%$req};
$reqcopy->{'_xcatdest'} = $s;
$reqcopy->{_xcatpreprocessed}->[0] = 1;
push @requests, $reqcopy;
}
}
}
}
}
if ( $hasHierarchy)
@ -1240,7 +1243,7 @@ sub process_request
my $ntype = $ntable->getNodeAttribs($n,['nodetype']);
# don't add if it is type "osi"
unless ($ntype =~ /osi/) {
unless ($ntype->{nodetype} =~ /osi/) {
push @tmplist, $n;
}
}