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

updatenoderunps performs one set of logic for both AIX and Linx

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14514 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2012-12-01 12:54:31 +00:00
parent aa0a705846
commit a646e632e4
1 changed files with 1 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1176,7 +1176,6 @@ sub updatenoderunps
my $localhostname = hostname();
my $installdir = xCAT::TableUtils->getInstallDir();
my $tftpdir = xCAT::TableUtils->getTftpDir();
my ($rc, $AIXnodes, $Linuxnodes) = xCAT::InstUtils->getOSnodes($nodes);
my $postscripts = "";
my $orig_postscripts = "";
@ -1194,8 +1193,6 @@ sub updatenoderunps
$subreq, 0, 1
);
if (scalar(@$Linuxnodes))
{
$postscripts = $orig_postscripts;
# we have Linux nodes
@ -1203,7 +1200,7 @@ sub updatenoderunps
# get server names as known by the nodes
my %servernodes =
%{xCAT::InstUtils->get_server_nodes($callback, \@$Linuxnodes)};
%{xCAT::InstUtils->get_server_nodes($callback, \@$nodes)};
# it's possible that the nodes could have diff server names
# do all the nodes for a particular server at once
@ -1277,92 +1274,8 @@ sub updatenoderunps
\&getdata
);
}
}
if (scalar(@$AIXnodes))
{
# we have AIX nodes
$postscripts = $orig_postscripts;
# get server names as known by the nodes
my %servernodes =
%{xCAT::InstUtils->get_server_nodes($callback, \@$AIXnodes)};
# it's possible that the nodes could have diff server names
# do all the nodes for a particular server at once
foreach my $snkey (keys %servernodes)
{
my $nodestring = join(',', @{$servernodes{$snkey}});
my $cmd;
my $mode;
if ( $request->{rerunps4security}
&& $request->{rerunps4security}->[0] eq "yes")
{
# for updatenode --security
$mode = "5";
}
else
{
# for updatenode -P
$mode = "1";
}
my $args1;
if ($::SETSERVER)
{
$args1 = [
"--nodestatus",
"-s",
"-v",
"-e",
"$installdir/postscripts/xcatdsklspost -M $snkey -c $mode --tftp $tftpdir '$postscripts'"
];
}
else
{
$args1 = [
"--nodestatus",
"-s",
"-v",
"-e",
"$installdir/postscripts/xcatdsklspost -m $snkey -c $mode --tftp $tftpdir '$postscripts' "
];
}
if ($::VERBOSE)
{
my $rsp = {};
$rsp->{data}->[0] =
" $localhostname: Internal call command: xdsh $nodestring "
. join(' ', @$args1);
$callback->($rsp);
}
$CALLBACK = $callback;
if ($request->{rerunps4security})
{
$RERUNPS4SECURITY = $request->{rerunps4security}->[0];
}
else
{
$RERUNPS4SECURITY = "";
}
$subreq->(
{
command => ["xdsh"],
node => $servernodes{$snkey},
arg => $args1,
_xcatpreprocessed => [1]
},
\&getdata
);
}
}
if ( $request->{rerunps4security}
&& $request->{rerunps4security}->[0] eq "yes")
{