From a0d3c6ce571c8b39c8ee1e87e970b913bac3d79c Mon Sep 17 00:00:00 2001 From: wanghuaz Date: Thu, 8 Mar 2012 08:24:33 +0000 Subject: [PATCH] Added pe/gpfs integration on x/rhels6.2 for stateful nodes git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11791 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- .../gpfs/gpfs.rhels6.x86_64.otherpkgs.pkglist | 1 + .../share/xcat/IBMhpc/gpfs/gpfs_updates | 4 ++- .../share/xcat/IBMhpc/pe/pe_install-1200 | 25 ++++++++++--------- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs.rhels6.x86_64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs.rhels6.x86_64.otherpkgs.pkglist index 2d950554b..e9d4e3032 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs.rhels6.x86_64.otherpkgs.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs.rhels6.x86_64.otherpkgs.pkglist @@ -1,3 +1,4 @@ gpfs/gpfs.base gpfs/gpfs.gpl +gpfs/gpfs.gplbin* gpfs/gpfs.msg.en_US diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_updates b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_updates index e5c375a48..9d12ea3f7 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_updates +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_updates @@ -41,10 +41,12 @@ if [ $OS != "AIX" ]; then mkdir -p /tmp/gpfs_updates rm -f -R /tmp/gpfs_updates/* cd /tmp/gpfs_updates - wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --cut-dirs=3 ftp://$SITEMASTER/$UPDATES_DIR/*.rpm 2> /tmp/wget.log +# wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --cut-dirs=3 ftp://$SITEMASTER/$UPDATES_DIR/*.rpm 2> /tmp/wget.log + wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --cut-dirs=4 --reject "index.html*" --no-parent http://$SITEMASTER$INSTALL_DIR/$UPDATES_DIR/ 2> /tmp/wget.log if [ -n "`ls *.rpm 2> /dev/null`" ] ; then rpm -Uvh *.rpm fi + cd / rm -f -R /tmp/gpfs_updates fi diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200 b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200 index 5b4a91255..be26a4820 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200 +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200 @@ -42,13 +42,14 @@ if [ $OS != "AIX" ]; then mkdir -p /tmp/pe rm -f -R /tmp/pe/* cd /tmp/pe - download_dir=`echo $PE_DIR | cut -d '/' -f3-` - wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --cut-dirs=5 ftp://$SITEMASTER/$download_dir/*.rpm 2> /tmp/wget.log - if [ ! -f /opt/ibmhpc/install/sbin/accept_ppe_license.sh ] ; then - rpm -Uvh IBM_pe_license*.rpm +# download_dir=`echo $PE_DIR | cut -d '/' -f3-` +# wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --cut-dirs=5 http://$SITEMASTER/$PE_DIR/*.rpm 2> /tmp/wget.log + wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --cut-dirs=6 --reject "index.html*" --no-parent http://$SITEMASTER$PE_DIR/ 2> /tmp/wget.log + if [ ! -f /opt/ibmhpc/pe1200/sbin/accept_ppe_license.sh ] ; then + rpm -Uvh pe/ppe_rte_license*.rpm fi - IBM_PE_LICENSE_PROMPT=N /opt/ibmhpc/install/sbin/accept_ppe_license.sh - rpm -Uvh --force ibm_lapi*.rpm ibm_pe*.rpm ppe_*.rpm + IBM_PPE_RTE_LICENSE_ACCEPT=yes /opt/ibmhpc/pe1200/sbin/accept_ppe_license.sh + rpm -Uvh ppe*.rpm cd / rm -Rf /tmp/pe fi @@ -60,32 +61,32 @@ if [ $OS != "AIX" ]; then # For SLES, assume zypper is available on the system running genimage if [ ! -d /opt/ibmhpc/pe1200/lap/license ] ; then # Install and accept PE license on the MN - IBM_PE_LICENSE_PROMPT=N zypper install $PE_DIR/ppe_rte_license*.rpm + IBM_PPE_RTE_LICENSE_ACCEPT=yes zypper install $PE_DIR/ppe_rte_license*.rpm fi # Install PE license rpm into image, BUT DO NOT ACCEPT # The java process fails when you try to run in chroot - zypper -R $installroot install $PE_DIR/ppe_rte_license*.rpm + IBM_PPE_RTE_LICENSE_ACCEPT=no zypper -R $installroot install $PE_DIR/ppe_rte_license*.rpm # Copy license files from MN into the image mkdir -p $installroot/opt/ibmhpc/pe1200/lap/license/ cp -pR /opt/ibmhpc/pe1200/lap/license/* $installroot/opt/ibmhpc/pe1200/lap/license # Install PE product rpms - INUCLIENTS=1 INUBOSTYPE=1 zypper -R $installroot install $PE_DIR/ppe_rte* $PE_DIR/pperte* + INUCLIENTS=1 INUBOSTYPE=1 zypper -R $installroot install $PE_DIR/pperte* else # For Redhat, etc., assume yum is available on the system running genimage if [ ! -d /opt/ibmhpc/pe1200/lap/license ] ; then # Install and accept PE license on the MN - IBM_PE_LICENSE_PROMPT=N yum --nogpgcheck localupdate $PE_DIR/ppe_rte_license*.rpm + IBM_PPE_RTE_LICENSE_ACCEPT=yes yum -y --nogpgcheck localupdate $PE_DIR/ppe_rte_license*.rpm #IBM_PE_LICENSE_PROMPT=N yum --nogpgcheck install $PE_DIR/ppe_rte_license*.rpm fi # Install PE license rpm into image, BUT DO NOT ACCEPT # The java process fails when you try to run in chroot - yum -y --installroot $installroot --nogpgcheck install $PE_DIR/ppe_rte_license*.rpm + IBM_PPE_RTE_LICENSE_ACCEPT=no yum -y --installroot $installroot --nogpgcheck install $PE_DIR/ppe_rte_license*.rpm # Copy license files from MN into the image mkdir -p $installroot/opt/ibmhpc/pe1200/lap/license/ cp -pR /opt/ibmhpc/pe1200/lap/license/* $installroot/opt/ibmhpc/pe1200/lap/license/ #chroot $installroot /opt/ibmhpc/install/sbin/accept_ppe_license.sh # Install PE product rpms - INUCLIENTS=1 INUBOSTYPE=1 yum -y --installroot $installroot --nogpgcheck install $PE_DIR/ppe_rte* $PE_DIR/pperte* + INUCLIENTS=1 INUBOSTYPE=1 yum -y --installroot $installroot --nogpgcheck install $PE_DIR/ppe_rte* $PE_DIR/pperte* fi fi fi