xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 09:13:08 +00:00
Code Issues Releases Wiki Activity

Improvements to RH/Centos Kickstart templates. (#4046)

Browse Source 
* remove spaces at EOL

* Saner partitioning section in templates

* Save install time xCAT logs for service nodes

* remove duplicates from `service.rhels7.*.pkglist`
This commit is contained in:
Samveen 2017-10-10 12:37:41 +07:00 committed by yangsong
parent 66cdb5c65c
commit 61805a19ab
6 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xCAT-server/share/xcat/install/centos/compute.centos7.tmpl
View File

@ -25,17 +25,17 @@ zerombr
#
clearpart --all --initlabel
#clearpart --linux
#key --skip
#
# Customize to fit your needs
#
#XCAT_PARTITION_START#
# xCAT based partitioning
%include /tmp/partitionfile
#No RAID
#/boot really significant for this sort of setup nowadays?
#part /boot --size 50 --fstype ext3
%include /tmp/partitionfile
#part swap --size 1024
#part / --size 1 --grow --fstype ext4

15
xCAT-server/share/xcat/install/rh/compute.rhels7.tmpl
View File

@ -31,13 +31,13 @@ clearpart --all --initlabel
#
#XCAT_PARTITION_START#
# xCAT based partitioning
%include /tmp/partitionfile
#No RAID
#/boot really significant for this sort of setup nowadays?
#part /boot --size 50 --fstype ext3
%include /tmp/partitionfile
#part swap --size 1024
#part swap --size 1024
#part / --size 1 --grow --fstype ext4
#XCAT_PARTITION_END#
#RAID 0 /scr for performance
#part / --size 1024 --ondisk sda
@ -68,6 +68,7 @@ clearpart --all --initlabel
#part raid.41 --size 1 --grow --ondisk sda
#part raid.42 --size 1 --grow --ondisk sdb
#raid /scr --level 1 --device md4 raid.41 raid.42
#XCAT_PARTITION_END#
#
# bootloader config
@ -119,7 +120,7 @@ skipx
#
# perl -e 'print crypt("blah","Xa") . "\n";'p
# openssl passwd -apr1 -salt xxxxxxxx password
#
#
# where "blah" is your root password.
#
#rootpw --iscrypted XaLGAVe1C41x2
@ -127,7 +128,7 @@ skipx
rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
#
# NIS setup: auth --enablenis --nisdomain sensenet
# NIS setup: auth --enablenis --nisdomain sensenet
# --nisserver neptune --useshadow --enablemd5
#
# OR
@ -154,7 +155,7 @@ reboot
{
echo "Running Kickstart Pre-Installation script..."
#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh.rhels7#
} >>/tmp/pre-install.log 2>&1
} &>>/tmp/pre-install.log
%end
%post
mkdir -p /var/log/xcat/
@ -165,5 +166,5 @@ EOF
echo "Running Kickstart Post-Installation script..."
#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.xcat#
#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rhels7#
} >>/var/log/xcat/xcat.log 2>&1
} &>>/var/log/xcat/xcat.log
%end

2
xCAT-server/share/xcat/install/rh/service.rhels7.ppc64.pkglist
View File

@ -27,12 +27,10 @@ openssh-server
openssl098e.ppc
openssl098e.ppc64
util-linux
perl-DBD-MySQL
perl-Socket6
unixODBC
perl-DBD-MySQL
mysql-connector-odbc
perl-DBD-Pg
wget
util-linux-ng
net-tools

2
xCAT-server/share/xcat/install/rh/service.rhels7.ppc64le.pkglist
View File

@ -25,14 +25,12 @@ gdb
binutils
openssh-server
util-linux
perl-DBD-MySQL
perl-Socket6
unixODBC
perl-DBD-MySQL
mysql-connector-odbc
perl-DBD-Pg
wget
util-linux-ng
net-tools
pciutils
bind-utils

23
xCAT-server/share/xcat/install/rh/service.rhels7.tmpl
View File

@ -31,13 +31,13 @@ clearpart --all --initlabel
#
#XCAT_PARTITION_START#
# xCAT based partitioning
%include /tmp/partitionfile
#No RAID
#/boot really significant for this sort of setup nowadays?
#part /boot --size 50 --fstype ext3
%include /tmp/partitionfile
#part swap --size 1024
#part swap --size 1024
#part / --size 1 --grow --fstype ext4
#XCAT_PARTITION_END#
#RAID 0 /scr for performance
#part / --size 1024 --ondisk sda
@ -68,6 +68,7 @@ clearpart --all --initlabel
#part raid.41 --size 1 --grow --ondisk sda
#part raid.42 --size 1 --grow --ondisk sdb
#raid /scr --level 1 --device md4 raid.41 raid.42
#XCAT_PARTITION_END#
#
# bootloader config
@ -76,7 +77,7 @@ clearpart --all --initlabel
# --md5pass <crypted MD5 password for GRUB>
#
#The bootloader config here is commented out
#For user customized partition file or partition script,
#For user customized partition file or partition script,
#the bootloader configuration should be specified in the user customized partition file/script
#For the xCAT default partition scheme, the bootloader configuration is in /tmp/partitionfile
#which is generated in %pre section
@ -119,7 +120,7 @@ skipx
#
# perl -e 'print crypt("blah","Xa") . "\n";'p
# openssl passwd -apr1 -salt xxxxxxxx password
#
#
# where "blah" is your root password.
#
#rootpw --iscrypted XaLGAVe1C41x2
@ -127,7 +128,7 @@ skipx
rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
#
# NIS setup: auth --enablenis --nisdomain sensenet
# NIS setup: auth --enablenis --nisdomain sensenet
# --nisserver neptune --useshadow --enablemd5
#
# OR
@ -151,9 +152,19 @@ reboot
#INCLUDE_DEFAULT_PKGLIST#
%end
%pre
{
echo "Running Kickstart Pre-Installation script..."
#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh.rhels7#
} &>>/tmp/pre-install.log
%end
%post
mkdir -p /var/log/xcat/
{
cat >> /var/log/xcat/xcat.log << "EOF"
%include /tmp/pre-install.log
EOF
echo "Running Kickstart Post-Installation script..."
#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.xcat#
#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rhels7#
} &>>/var/log/xcat/xcat.log
%end

1
xCAT-server/share/xcat/install/rh/service.rhels7.x86_64.pkglist
View File

@ -25,5 +25,4 @@ perl-DBD-MySQL
mysql-connector-odbc
perl-DBD-Pg
wget
util-linux
net-tools