From 61805a19ab73e8a7a123ab28c168133e3b656426 Mon Sep 17 00:00:00 2001 From: Samveen Date: Tue, 10 Oct 2017 12:37:41 +0700 Subject: [PATCH] Improvements to RH/Centos Kickstart templates. (#4046) * remove spaces at EOL * Saner partitioning section in templates * Save install time xCAT logs for service nodes * remove duplicates from `service.rhels7.*.pkglist` --- .../xcat/install/centos/compute.centos7.tmpl | 4 ++-- .../share/xcat/install/rh/compute.rhels7.tmpl | 15 ++++++------ .../install/rh/service.rhels7.ppc64.pkglist | 2 -- .../install/rh/service.rhels7.ppc64le.pkglist | 2 -- .../share/xcat/install/rh/service.rhels7.tmpl | 23 ++++++++++++++----- .../install/rh/service.rhels7.x86_64.pkglist | 1 - 6 files changed, 27 insertions(+), 20 deletions(-) diff --git a/xCAT-server/share/xcat/install/centos/compute.centos7.tmpl b/xCAT-server/share/xcat/install/centos/compute.centos7.tmpl index c261d7bbc..b8cc19ca5 100644 --- a/xCAT-server/share/xcat/install/centos/compute.centos7.tmpl +++ b/xCAT-server/share/xcat/install/centos/compute.centos7.tmpl @@ -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 diff --git a/xCAT-server/share/xcat/install/rh/compute.rhels7.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhels7.tmpl index cd9380a86..b8cc19ca5 100644 --- a/xCAT-server/share/xcat/install/rh/compute.rhels7.tmpl +++ b/xCAT-server/share/xcat/install/rh/compute.rhels7.tmpl @@ -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 diff --git a/xCAT-server/share/xcat/install/rh/service.rhels7.ppc64.pkglist b/xCAT-server/share/xcat/install/rh/service.rhels7.ppc64.pkglist index 5314810f5..d9330841a 100644 --- a/xCAT-server/share/xcat/install/rh/service.rhels7.ppc64.pkglist +++ b/xCAT-server/share/xcat/install/rh/service.rhels7.ppc64.pkglist @@ -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 diff --git a/xCAT-server/share/xcat/install/rh/service.rhels7.ppc64le.pkglist b/xCAT-server/share/xcat/install/rh/service.rhels7.ppc64le.pkglist index 9c169c658..a12fcc3e0 100644 --- a/xCAT-server/share/xcat/install/rh/service.rhels7.ppc64le.pkglist +++ b/xCAT-server/share/xcat/install/rh/service.rhels7.ppc64le.pkglist @@ -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 diff --git a/xCAT-server/share/xcat/install/rh/service.rhels7.tmpl b/xCAT-server/share/xcat/install/rh/service.rhels7.tmpl index 37a5ee1b2..b8cc19ca5 100644 --- a/xCAT-server/share/xcat/install/rh/service.rhels7.tmpl +++ b/xCAT-server/share/xcat/install/rh/service.rhels7.tmpl @@ -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 # #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 diff --git a/xCAT-server/share/xcat/install/rh/service.rhels7.x86_64.pkglist b/xCAT-server/share/xcat/install/rh/service.rhels7.x86_64.pkglist index bc571151f..0f4b28111 100644 --- a/xCAT-server/share/xcat/install/rh/service.rhels7.x86_64.pkglist +++ b/xCAT-server/share/xcat/install/rh/service.rhels7.x86_64.pkglist @@ -25,5 +25,4 @@ perl-DBD-MySQL mysql-connector-odbc perl-DBD-Pg wget -util-linux net-tools