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

Added addkit --inspection flag to give the general kit info before adding kits to xcat. also fixing a bug with kit plugin.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14288 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz
2012-11-09 04:31:08 +00:00
parent 995435b8b7
commit cc4a3092bf
1 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
xCAT-server/lib/xcat/plugins/kit.pm
View File

@@ -691,6 +691,7 @@ sub addkit
push@{ $rsp{data} }, "addkit: add Kits into xCAT from a list of tarball file or directory which have the same structure with tarball file";
push@{ $rsp{data} }, "Usage: ";
push@{ $rsp{data} }, "\taddkit [-h|--help]";
push@{ $rsp{data} }, "\taddkit [-i|--inspection] <kitlist>]";
push@{ $rsp{data} }, "\taddkit [-p|--path <path>] <kitlist>] [-V]";
xCAT::MsgUtils->message( "I", \%rsp, $callback );
};
@@ -707,6 +708,7 @@ sub addkit
GetOptions(
'h|help' => \$help,
'V|verbose' => \$::VERBOSE,
'i|inspection' => \$inspection,
'p|path=s' => \$path,
);
@@ -871,11 +873,21 @@ sub addkit
unless (keys %kithash) {
my %rsp;
push@{ $rsp{data} }, "Failed to add kit because kit.conf is invalid";
push@{ $rsp{data} }, "Failed to add kit $kit because kit.conf is invalid";
xCAT::MsgUtils->message( "E", \%rsp, $callback );
return 1;
}
if ( $inspection ) {
my %rsp;
push@{ $rsp{data} }, "kitname=$kitname";
push@{ $rsp{data} }, " desc=$kithash{$kitname}{desc}";
push@{ $rsp{data} }, " version=$kithash{$kitname}{version}";
push@{ $rsp{data} }, " ostype=$kithash{$kitname}{ostype}";
xCAT::MsgUtils->message( "I", \%rsp, $callback );
next;
}
(my $ref1) = $tabs{kit}->getAttribs({kitname => $kitname}, 'basename');
if ( $ref1 and $ref1->{'basename'}){
my %rsp;
@@ -946,16 +958,19 @@ sub addkit
}
# Copying plugins to /opt/xcat/lib/perl/xCAT_plugin/
chmod(644, "$kitdir/plugins/*");
if ( -d "$kitdir/plugins/" ) {
if($::VERBOSE){
my %rsp;
push@{ $rsp{data} }, "Copying kit plugins from $kitdir/plugins/ to $::XCATROOT/lib/perl/xCAT_plugin";
xCAT::MsgUtils->message( "I", \%rsp, $callback );
chmod(644, "$kitdir/plugins/*");
$rc = system("cp -rfv $kitdir/plugins/* $::XCATROOT/lib/perl/xCAT_plugin/");
} else {
$rc = system("cp -rf $kitdir/plugins/* $::XCATROOT/lib/perl/xCAT_plugin/");
if($::VERBOSE){
my %rsp;
push@{ $rsp{data} }, "Copying kit plugins from $kitdir/plugins/ to $::XCATROOT/lib/perl/xCAT_plugin";
xCAT::MsgUtils->message( "I", \%rsp, $callback );
$rc = system("cp -rfv $kitdir/plugins/* $::XCATROOT/lib/perl/xCAT_plugin/");
} else {
$rc = system("cp -rf $kitdir/plugins/* $::XCATROOT/lib/perl/xCAT_plugin/");
}
}
if($rc){
@@ -987,14 +1002,15 @@ sub addkit
push @kitnames, $kit;
}
my $kitlist = join ',', @kitnames;
my %rsp;
push@{ $rsp{data} }, "Kit $kitlist was successfully added.";
xCAT::MsgUtils->message( "I", \%rsp, $callback );
# Issue xcatd reload to load the new plugins
system("/etc/init.d/xcatd reload");
unless ( $inspection ) {
my $kitlist = join ',', @kitnames;
my %rsp;
push@{ $rsp{data} }, "Kit $kitlist was successfully added.";
xCAT::MsgUtils->message( "I", \%rsp, $callback );
# Issue xcatd reload to load the new plugins
system("/etc/init.d/xcatd reload");
}
}
@@ -2115,6 +2131,9 @@ sub rmkitcomp
my @lines = ();
if ( -e "$installdir/osimages/$osimage/kits/KIT_DEPLOY_PARAMS.otherpkgs.pkglist" ) {
system("cp $installdir/osimages/$osimage/kits/KIT_DEPLOY_PARAMS.otherpkgs.pkglist $installdir/osimages/$osimage/kits/KIT_DEPLOY_PARAMS.otherpkgs.pkglist.orig");
if (open(DEPLOYPARAM, "<", "$installdir/osimages/$osimage/kits/KIT_DEPLOY_PARAMS.otherpkgs.pkglist")) {
@lines = <DEPLOYPARAM>;
close(DEPLOYPARAM);