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

fix defect 3641

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16775 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav
2013-06-26 18:09:22 +00:00
parent 2aefc417d9
commit 98295e06b1
1 changed files with 84 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
xCAT-server/lib/xcat/plugins/updatenode.pm
View File

@@ -566,22 +566,87 @@ sub preprocess_updatenode
# Get the MN names
my @MNip = xCAT::NetworkUtils->determinehostname;
my @MNnodeinfo = xCAT::NetworkUtils->determinehostname;
my $MNnodename = pop @MNnodeinfo; # hostname
my @MNnodeipaddr = @MNnodeinfo; # ipaddresses
# if no service nodes, or I am on a Service Node, then no hierarchy to deal with
my @sns = ();
foreach my $s (keys %$sn)
{
my @tmp_a = split(',', $s);
foreach my $s1 (@tmp_a)
{
if (!grep (/^$s1$/, @MNip))
{
push @sns, $s1;
}
}
if (! (xCAT::Utils->isServiceNode())) { # not on a servicenode
if ($sn)
{
foreach my $snkey (keys %$sn)
{
if (!grep(/$snkey/, @MNnodeipaddr)) # don't put the MN in the array
{ # if not the MN
push @sns, $snkey;
}
}
}
}
# build each request for each node
foreach my $snkey (keys %$sn)
{
# my @sns = ();
# foreach my $s (keys %$sn)
# {
# my @tmp_a = split(',', $s);
# foreach my $s1 (@tmp_a)
# {
# if (!grep (/^$s1$/, @MNip))
# {
# push @sns, $s1;
# }
# }
# }
if (defined($::SWMAINTENANCE))
{
$request->{swmaintenance}->[0] = "yes";
# send along the update info and osimage defs
if ($imagedef)
{
xCAT::InstUtils->taghash($imagedef);
$request->{imagedef} = [$imagedef];
}
if ($updateinfo)
{
xCAT::InstUtils->taghash($updateinfo);
$request->{updateinfo} = [$updateinfo];
}
}
if (defined($::RERUNPS))
{
$request->{rerunps}->[0] = "yes";
$request->{postscripts} = [$postscripts];
if (defined($::SECURITY))
{
$request->{rerunps4security}->[0] = "yes";
}
}
if (defined($::SECURITY))
{
$request->{security}->[0] = "yes";
}
#
# Handle updating OS
#
if (defined($::OS))
{
$request->{os}->[0] = "yes";
}
#
# if hierarchy, then split the request -F must run on the MN and -P -S on the service nodes
#
if (@sns) { # if servicenodes
# build each request for each servicenode
foreach my $snkey (keys %$sn)
{
# build request
@@ -591,47 +656,14 @@ sub preprocess_updatenode
$reqcopy->{'_xcatdest'} = $snkey;
$reqcopy->{_xcatpreprocessed}->[0] = 1;
if (defined($::SWMAINTENANCE))
{
$reqcopy->{swmaintenance}->[0] = "yes";
# send along the update info and osimage defs
if ($imagedef)
{
xCAT::InstUtils->taghash($imagedef);
$reqcopy->{imagedef} = [$imagedef];
}
if ($updateinfo)
{
xCAT::InstUtils->taghash($updateinfo);
$reqcopy->{updateinfo} = [$updateinfo];
}
}
if (defined($::RERUNPS))
{
$reqcopy->{rerunps}->[0] = "yes";
$reqcopy->{postscripts} = [$postscripts];
if (defined($::SECURITY))
{
$reqcopy->{rerunps4security}->[0] = "yes";
}
}
if (defined($::SECURITY))
{
$reqcopy->{security}->[0] = "yes";
}
#
# Handle updating OS
#
if (defined($::OS))
{
$reqcopy->{os}->[0] = "yes";
}
push @requests, $reqcopy;
}
} else { # no hierarchy, process it right now , here on the MN
$request->{_xcatpreprocessed}->[0] = 1;
&updatenode($request, $callback, $subreq);
return;
}
return \@requests;
}