From 63bc149a826b8db77c29178d5ba84761f448c61d Mon Sep 17 00:00:00 2001 From: wanghuaz Date: Wed, 28 Mar 2012 07:41:57 +0000 Subject: [PATCH] Using a new method to install PE packages. otherpkgs now accept system environment, so we can use this way to install pe licience rpm git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12029 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- .../IBMhpc/pe/pe-1200.ppc64.otherpkgs.pkglist | 14 +++++ ...e.rhels6.pkglist => pe-1200.ppc64.pkglist} | 3 +- .../pe/pe-1200.x86_64.otherpkgs.pkglist | 14 +++++ ....x86_64.pkglist => pe-1200.x86_64.pkglist} | 0 .../pe/pe.rhels6.x86_64.otherpkgs.pkglist | 2 - .../share/xcat/IBMhpc/pe/pe_install-1200 | 55 ------------------- 6 files changed, 30 insertions(+), 58 deletions(-) create mode 100644 xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.ppc64.otherpkgs.pkglist rename xCAT-IBMhpc/share/xcat/IBMhpc/pe/{pe.rhels6.pkglist => pe-1200.ppc64.pkglist} (95%) mode change 100755 => 100644 create mode 100644 xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.x86_64.otherpkgs.pkglist rename xCAT-IBMhpc/share/xcat/IBMhpc/pe/{pe.rhels6.x86_64.pkglist => pe-1200.x86_64.pkglist} (100%) delete mode 100644 xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.rhels6.x86_64.otherpkgs.pkglist diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.ppc64.otherpkgs.pkglist new file mode 100644 index 000000000..4f45d5cb0 --- /dev/null +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.ppc64.otherpkgs.pkglist @@ -0,0 +1,14 @@ +pe/src +pe/ibm_openshmem_* + +#ENV:IBM_PPE_RTE_LICENSE_ACCEPT=yes# +pe/ppe_rte_license* + +#ENV:INUCLIENTS=1# +#ENV:INUBOSTYPE=1# +pe/pperteman* +pe/pperterh6x* +pe/ppertesamples* + +# PE HPC toolkit needed on login node +#pe/ppedev_hpct_* diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.rhels6.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.ppc64.pkglist old mode 100755 new mode 100644 similarity index 95% rename from xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.rhels6.pkglist rename to xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.ppc64.pkglist index 5df1e4127..0ba165842 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.rhels6.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.ppc64.pkglist @@ -7,4 +7,5 @@ # that does a force install of pe. The current pe packages prereq # these libibverbs packages. libibverbs.ppc -libibverbs.ppc64 \ No newline at end of file +libibverbs.ppc64 + diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.x86_64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.x86_64.otherpkgs.pkglist new file mode 100644 index 000000000..4f45d5cb0 --- /dev/null +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.x86_64.otherpkgs.pkglist @@ -0,0 +1,14 @@ +pe/src +pe/ibm_openshmem_* + +#ENV:IBM_PPE_RTE_LICENSE_ACCEPT=yes# +pe/ppe_rte_license* + +#ENV:INUCLIENTS=1# +#ENV:INUBOSTYPE=1# +pe/pperteman* +pe/pperterh6x* +pe/ppertesamples* + +# PE HPC toolkit needed on login node +#pe/ppedev_hpct_* diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.rhels6.x86_64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.x86_64.pkglist similarity index 100% rename from xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.rhels6.x86_64.pkglist rename to xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.x86_64.pkglist diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.rhels6.x86_64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.rhels6.x86_64.otherpkgs.pkglist deleted file mode 100644 index ffe745895..000000000 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.rhels6.x86_64.otherpkgs.pkglist +++ /dev/null @@ -1,2 +0,0 @@ -pe/src -pe/ibm_openshmem_* diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200 b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200 index 48c2bd9bd..c70c35cb0 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200 +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200 @@ -19,61 +19,6 @@ # - Configure poe.limits file OS=`uname` -INSTALL_DIR='/install' -PE_DIR=$pedir - -if [ -z "$PE_DIR" ]; then - # try to default - PE_DIR=$INSTALL_DIR/post/otherpkgs/$OSVER/$ARCH/pe -fi - - -if [ $NODESETSTATE != "genimage" ]; then - # running as a postscript in a full-disk install or AIX diskless install - installroot="" -fi - - - -if [ $OS != "AIX" ]; then - if [ $NODESETSTATE == "install" ] || [ $NODESETSTATE == "boot" ]; then - # Being run from a stateful install postscript - # Copy rpms directly from the xCAT management node and install - 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 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 - IBM_PPE_RTE_LICENSE_ACCEPT=yes rpm -Uvh ppe_rte_license*.rpm - fi - IBM_PPE_RTE_LICENSE_ACCEPT=yes /opt/ibmhpc/pe1200/sbin/accept_ppe_license.sh - rpm -Uvh --force ppe*.rpm - cd / - rm -Rf /tmp/pe - fi - - if [ $NODESETSTATE == "genimage" ]; then - # Being called from .postinstall script - # Assume we are on the same machine - if [[ $OS = sles* ]] || [[ $OS = suse* ]] || [[ -f /etc/SuSE-release ]]; then - # For SLES, assume zypper is available on the system running genimage - # Install PE license rpm into image - IBM_PPE_RTE_LICENSE_ACCEPT=yes zypper -R $installroot install $PE_DIR/ppe_rte_license*.rpm - # Install PE product rpms - INUCLIENTS=1 INUBOSTYPE=1 zypper -R $installroot install $PE_DIR/pperte* - else - # For Redhat, etc., assume yum is available on the system running genimage - # Install PE license rpm into image - IBM_PPE_RTE_LICENSE_ACCEPT=yes yum -y --installroot $installroot --nogpgcheck install $PE_DIR/ppe_rte_license*.rpm - # Install PE product rpms - INUCLIENTS=1 INUBOSTYPE=1 yum -y --installroot $installroot --nogpgcheck install $PE_DIR/ppe_rte* $PE_DIR/pperte* - fi - fi -fi - - # Configure the PNSD.cfg to use a smaller log so it doesn't use so much memory # for a stateless image. Normally, pnsd creates this file if it does not