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

Add support for pkglist. Install Ganglia automatically in self-service page.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10712 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
phamt 2011-10-07 20:09:59 +00:00
parent 5eff163a9e
commit 3c01fbd4f7
11 changed files with 80 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
xCAT-server/lib/xcat/plugins/zvm.pm
View File

@ -3307,6 +3307,9 @@ sub nodeSet {
# SUSE installation
my $customTmpl;
my $pkglist;
my $patterns = '';
my $packages = '';
if ( $os =~ m/sles/i ) {
# Create directory in FTP root (/install) to hold template
@ -3321,7 +3324,37 @@ sub nodeSet {
xCAT::zvmUtils->printLn( $callback, "$node: (Error) An autoyast template does not exist for $os in $installDir/custom/install/sles/" );
return;
}
# Get pkglist from /install/custom/install/sles/compute.sles11.s390x.otherpkgs.pkglist
# Original one is in /opt/xcat/share/xcat/install/sles/compute.sles11.s390x.otherpkgs.pkglist
$pkglist = "/install/custom/install/sles/" . $profile . "." . $osBase . "." . $arch . ".pkglist";
if ( !(-e $pkglist) ) {
xCAT::zvmUtils->printLn( $callback, "$node: Missing package list for $os in /install/custom/install/sles/" );
return;
}
# Read in each software pattern or package
open (FILE, $pkglist);
while (<FILE>) {
chomp;
# Create <xml> tags, e.g.
# <package>apache</package>
# <pattern>directory_server</pattern>
$_ = xCAT::zvmUtils->trimStr($_);
if ($_ && $_ =~ /@/) {
$_ =~ s/@//g;
$patterns .= "<pattern>$_</pattern>";
} elsif ($_) {
$packages .= "<package>$_</package>";
}
}
close (FILE);
# Add appropriate software packages or patterns
$out = `sed --in-place -e "s,replace_software_packages,$packages,g" \ -e "s,replace_software_patterns,$patterns,g" $customTmpl`;
# Copy postscript into template
$out = `sed --in-place -e "/<scripts>/r $postScript" $customTmpl`;
@ -3332,9 +3365,7 @@ sub nodeSet {
# SLES 11
if ( $os =~ m/sles11/i ) {
$device = "eth0";
}
else {
} else {
# SLES 10
$device = "qeth-bus-ccw-$readChannel";
}
@ -3457,6 +3488,26 @@ sub nodeSet {
return;
}
# Get pkglist from /install/custom/install/sles/compute.sles11.s390x.otherpkgs.pkglist
# Original one is in /opt/xcat/share/xcat/install/sles/compute.sles11.s390x.otherpkgs.pkglist
$pkglist = "/install/custom/install/rh/" . $profile . "." . $osBase . "." . $arch . ".pkglist";
if ( !(-e $pkglist) ) {
xCAT::zvmUtils->printLn( $callback, "$node: Missing package list for $os in /install/custom/install/rh/" );
return;
}
# Read in each software pattern or package
open (FILE, $pkglist);
while (<FILE>) {
chomp;
$_ = xCAT::zvmUtils->trimStr($_);
$packages .= "$_\\n";
}
close (FILE);
# Add appropriate software packages or patterns
$out = `sed --in-place -e "s,replace_software_packages,$packages,g" $customTmpl`;
# Copy postscript into template
$out = `sed --in-place -e "/%post/r $postScript" $customTmpl`;

1
xCAT-server/share/xcat/install/rh/compute.rhel5.s390x.pkglist
View File

@ -4,3 +4,4 @@
fipscheck
device-mapper-multipath
sgpio
apr

4
xCAT-server/share/xcat/install/rh/compute.rhel5.s390x.tmpl
View File

@ -23,8 +23,6 @@ part / --fstype ext3 --size=100 --grow --ondisk=dasda
part swap --size=512 --ondisk=dasda
%packages
@base
@core
@base-x
replace_software_packages
%post

3
xCAT-server/share/xcat/install/rh/compute.rhels6.s390x.pkglist Normal file
View File

@ -0,0 +1,3 @@
@base
@core
apr

3
xCAT-server/share/xcat/install/rh/compute.rhels6.s390x.tmpl
View File

@ -23,7 +23,6 @@ part / --fstype ext3 --size=100 --grow --ondisk=dasda
part swap --size=512 --ondisk=dasda
%packages
@base
@core
replace_software_packages
%post

3
xCAT-server/share/xcat/install/sles/compute.sles10.s390x.pkglist
View File

@ -1,4 +1,3 @@
@base
@x11
@gnome
libapr1

7
xCAT-server/share/xcat/install/sles/compute.sles10.s390x.tmpl
View File

@ -533,10 +533,13 @@
<!-- Software to install on Linux -->
<software>
<patterns config:type="list">
<pattern>base</pattern>
replace_software_patterns
</patterns>
<packages config:type="list">
replace_software_packages
</packages>
</software>
<!-- Time zone -->
<timezone>

3
xCAT-server/share/xcat/install/sles/compute.sles11.s390x.pkglist
View File

@ -1,4 +1,3 @@
@base
@x11
@gnome
libapr1

5
xCAT-server/share/xcat/install/sles/compute.sles11.s390x.tmpl
View File

@ -533,8 +533,11 @@
<!-- Software to install on Linux -->
<software>
<patterns config:type="list">
<pattern>base</pattern>
replace_software_patterns
</patterns>
<packages config:type="list">
replace_software_packages
</packages>
</software>

5
xCAT-server/share/xcat/install/sles/ref.sles10.s390x.tmpl
View File

@ -320,8 +320,11 @@
<!-- Software to install on Linux -->
<software>
<patterns config:type="list">
insert_software_pattern
replace_software_patterns
</patterns>
<packages config:type="list">
replace_software_packages
</packages>
</software>

5
xCAT-server/share/xcat/install/sles/ref.sles11.s390x.tmpl
View File

@ -320,8 +320,11 @@
<!-- Software to install on Linux -->
<software>
<patterns config:type="list">
insert_software_pattern
replace_software_patterns
</patterns>
<packages config:type="list">
replace_software_packages
</packages>
</software>