Clean up. New packages in 1.3.2, don't need additional config.

Change-Id: Ia2aae5fab2effb0244e3169a4c4f17747470b74b

13 files changed, 26 insertions, 178 deletions

diff --git a/centos7/00_base_install.sh b/centos7/00_base_install.sh
index 07fcdec..c7a8644 100755
--- a/centos7/00_base_install.sh
+++ b/centos7/00_base_install.sh
@@ -4,9 +4,10 @@
 # The base of this script is from the docs-ohpc package at
 # /opt/ohpc/pub/doc/recipes/centos7/aarch64/warewulf/slurm/recipe.sh
 # For more information, see the OpenHPC installation guide, Apendix A.
+# Requires input.local and a set environment correctly beforehand.
 
+######################################################
 # Stage 00: Base install of OpenHPC
-# Requires input.local and a set environment correctly beforehand.
 
 set -ex
 
diff --git a/centos7/01_master_pkgs.sh b/centos7/01_master_pkgs.sh
index 55b1dce..da20b7b 100755
--- a/centos7/01_master_pkgs.sh
+++ b/centos7/01_master_pkgs.sh
@@ -4,9 +4,10 @@
 # The base of this script is from the docs-ohpc package at
 # /opt/ohpc/pub/doc/recipes/centos7/aarch64/warewulf/slurm/recipe.sh
 # For more information, see the OpenHPC installation guide, Apendix A.
+# Requires input.local and a set environment correctly beforehand.
 
+######################################################
 # Stage 01: Master Packages only
-# Requires input.local and a set environment correctly beforehand.
 
 set -ex
 
diff --git a/centos7/02_master_network.sh b/centos7/02_master_network.sh
index be5ff79..b988af1 100755
--- a/centos7/02_master_network.sh
+++ b/centos7/02_master_network.sh
@@ -4,10 +4,11 @@
 # The base of this script is from the docs-ohpc package at
 # /opt/ohpc/pub/doc/recipes/centos7/aarch64/warewulf/slurm/recipe.sh
 # For more information, see the OpenHPC installation guide, Apendix A.
-
-# Stage 03: Master network setup (stand-alone or gateway)
 # Requires input.local and a set environment correctly beforehand.
 
+######################################################
+# Stage 02: Master network setup
+
 set -ex
 
 . ./input.local
diff --git a/centos7/03_master_provision.sh b/centos7/03_master_provision.sh
index e89ecca..f555aab 100755
--- a/centos7/03_master_provision.sh
+++ b/centos7/03_master_provision.sh
@@ -4,10 +4,11 @@
 # The base of this script is from the docs-ohpc package at
 # /opt/ohpc/pub/doc/recipes/centos7/aarch64/warewulf/slurm/recipe.sh
 # For more information, see the OpenHPC installation guide, Apendix A.
-
-# Stage 04: Master provision (chroot/tftp) and initialise warewulf
 # Requires input.local and a set environment correctly beforehand.
 
+######################################################
+# Stage 03: Master provision and initialise warewulf
+
 set -ex
 
 . ./input.local
diff --git a/centos7/05_optional.sh b/centos7/04_optional.sh
index 3a7ea0c..073c5d9 100755
--- a/centos7/05_optional.sh
+++ b/centos7/04_optional.sh
@@ -5,7 +5,8 @@
 # /opt/ohpc/pub/doc/recipes/centos7/aarch64/warewulf/slurm/recipe.sh
 # For more information, see the OpenHPC installation guide, Apendix A.
 
-# FIXME / TODO: Separate this into master/slave setups
+######################################################
+# Stage 04: Configure additional optional steps
 
 # Not done yet
 exit 1
diff --git a/centos7/06_master_files.sh b/centos7/05_master_files.sh
index 851a18f..156d97f 100755
--- a/centos7/06_master_files.sh
+++ b/centos7/05_master_files.sh
@@ -4,10 +4,11 @@
 # The base of this script is from the docs-ohpc package at
 # /opt/ohpc/pub/doc/recipes/centos7/aarch64/warewulf/slurm/recipe.sh
 # For more information, see the OpenHPC installation guide, Apendix A.
-
-# Stage 07: Track Master files
 # Requires input.local and a set environment correctly beforehand.
 
+######################################################
+# Stage 05: Track Master files in warewulf
+
 set -ex
 
 . ./input.local
diff --git a/centos7/07_master_bootstrap.sh b/centos7/06_master_bootstrap.sh
index 907daa6..cfd72dd 100755
--- a/centos7/07_master_bootstrap.sh
+++ b/centos7/06_master_bootstrap.sh
@@ -4,10 +4,11 @@
 # The base of this script is from the docs-ohpc package at
 # /opt/ohpc/pub/doc/recipes/centos7/aarch64/warewulf/slurm/recipe.sh
 # For more information, see the OpenHPC installation guide, Apendix A.
-
-# Stage 08: Master bootstrap (TFTP/PXE/DHCP) & register nodes
 # Requires input.local to set environment correctly beforehand.
 
+######################################################
+# Stage 06: Master bootstrap & register nodes
+
 set -ex
 
 . ./input.local
diff --git a/centos7/08_devtools.sh b/centos7/07_devtools.sh
index f2978ac..04f3ce6 100755
--- a/centos7/08_devtools.sh
+++ b/centos7/07_devtools.sh
@@ -4,10 +4,11 @@
 # The base of this script is from the docs-ohpc package at
 # /opt/ohpc/pub/doc/recipes/centos7/aarch64/warewulf/slurm/recipe.sh
 # For more information, see the OpenHPC installation guide, Apendix A.
-
-# Stage 09: Install login development tools (not necessarily the master)
 # Requires input.local to set environment correctly beforehand.
 
+######################################################
+# Stage 07: Install login development tools
+
 # WARNING: This script *requires* OpenHPC 1.3.1 or newer
 
 set -ex
diff --git a/centos7/09_system_start.sh b/centos7/08_system_start.sh
index a09bd63..ee9b3b6 100755
--- a/centos7/09_system_start.sh
+++ b/centos7/08_system_start.sh
@@ -4,10 +4,11 @@
 # The base of this script is from the docs-ohpc package at
 # /opt/ohpc/pub/doc/recipes/centos7/aarch64/warewulf/slurm/recipe.sh
 # For more information, see the OpenHPC installation guide, Apendix A.
-
-# Stage 10: Master & slave restart and final setup
 # Requires input.local to set environment correctly beforehand.
 
+######################################################
+# Stage 08: Master & slave restart
+
 set -ex
 
 . ./input.local
diff --git a/centos7/10_test_suite.sh b/centos7/09_test_suite.sh
index 20aaf89..39a50ee 100755
--- a/centos7/10_test_suite.sh
+++ b/centos7/09_test_suite.sh
@@ -4,9 +4,10 @@
 # The base of this script is from the docs-ohpc package at
 # /opt/ohpc/pub/doc/recipes/centos7/aarch64/warewulf/slurm/recipe.sh
 # For more information, see the OpenHPC installation guide, Apendix A.
+# Requires input.local to set environment correctly beforehand.
 
+######################################################
 # Stage 10: Test-Suite
-# Requires input.local to set environment correctly beforehand.
 
 # WARNING: EXPERIMENTAL!
 
diff --git a/centos7/ohpc-additional-packages/.gitignore b/centos7/ohpc-additional-packages/.gitignore
deleted file mode 100644
index 586916b..0000000
--- a/centos7/ohpc-additional-packages/.gitignore
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Normal rules
-#
-.*
-*.o
-*.o.*
-*.a
-*.s
-*.ko
-*.so
-*.so.dbg
-*.mod.c
-*.i
-*.lst
-*.symtypes
-*.order
-*.elf
-*.bin
-*.gz
-*.bz2
-*.lzma
-*.gcno
-
-#
-# Top-level generic files
-#
-tags
-TAGS
-vmlinux
-System.map
-Module.markers
-Module.symvers
-!.gitignore
-
-# stgit generated dirs
-patches-*
-
-# quilt's files
-patches
-series
-
-# cscope files
-cscope.*
-ncscope.*
-
-# gnu global files
-GPATH
-GRTAGS
-GSYMS
-GTAGS
-
-*.orig
-*.rej
-*~
-\#*#
-
-*.ini
-*.tgz
-*.tar.gz
-*.tbz
-*.tar.bz2
-*.txz
-*.tar.xz
-*.pyo
-*.pyc
-*.exe
-*.bin
-*.elf
-
-#
-#script specific rules
-#
-downloads/
-
-
diff --git a/centos7/ohpc-additional-packages/package-list.txt b/centos7/ohpc-additional-packages/package-list.txt
deleted file mode 100644
index 2912425..0000000
--- a/centos7/ohpc-additional-packages/package-list.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-netcdf-gnu7-openmpi-ohpc-4.4.1.1-19.1.aarch64.rpm
-petsc-gnu7-openmpi-ohpc-3.7.6-26.1.aarch64.rpm
-phdf5-gnu7-openmpi-ohpc-1.10.0-23.1.aarch64.rpm
-plasma-gnu-openmpi-ohpc-2.8.0-10.1.aarch64.rpm
-ptscotch-gnu-openmpi-ohpc-6.0.4-5.1.aarch64.rpm
-scotch-gnu-ohpc-6.0.4-9.1.aarch64.rpm
diff --git a/centos7/ohpc-additional-packages/recipe-additional-packages.sh b/centos7/ohpc-additional-packages/recipe-additional-packages.sh
deleted file mode 100755
index 47dc0ea..0000000
--- a/centos7/ohpc-additional-packages/recipe-additional-packages.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env bash
-DOWNLOAD_DIR=`pwd`/downloads
-DOWNLOAD_URL=http://build.openhpc.community/home:/xtcohpc:/OHPCARM/OpenHPC_1.3_Update1_Factory_CentOS_7/aarch64/
-INSTALL_CMD="yum install "
-PKG_LIST=package-list.txt
-
-download_packages(){
-    local line
-    
-    if [ ! -f "${PKG_LIST}" ]; then
-	echo "Can not find ${PKG_LIST}"
-	exit 1
-    fi
-
-    mkdir -p ${DOWNLOAD_DIR}
-    if [ ! -d ${DOWNLOAD_DIR} ]; then
-	echo "Can not create download dir:${DOWNLOAD_DIR}"
-	exit 1
-    fi
-
-    pushd ${DOWNLOAD_DIR}
-    rm -f *.rpm
-    popd
-
-    cat ${PKG_LIST}|sed -e "s@\#.*@@g"|while read line
-    do
-	echo "Download ${line} from ${DOWNLOAD_URL}"
-	pushd ${DOWNLOAD_DIR}
-	wget ${DOWNLOAD_URL}/${line}
-	popd
-    done
-}
-
-install_packages(){
-    local file
-
-    if [ ! -d ${DOWNLOAD_DIR} ]; then
-	echo "Can not create download dir:${DOWNLOAD_DIR}"
-	exit 1
-    fi
-
-    pushd ${DOWNLOAD_DIR}
-    ls -1 *.rpm|while read file
-    do
-    echo "Install ${file} ... "
-    ${INSTALL_CMD} ${file}
-    done
-    popd
-}
-
-remove_downloaded_files(){
-
-    if [ ! -d ${DOWNLOAD_DIR} ]; then
-	echo "Download dir${DOWNLOAD_DIR} does not exist."
-	return
-    fi
-
-    pushd ${DOWNLOAD_DIR}
-    ls -1 *.rpm|while read file
-    do
-    echo "Remove ${file} ... "
-    rm -f ${file}
-    done
-    popd
-
-    if [ -z "$(ls -A ${DOWNLOAD_DIR}/)" ]; then
-	rmdir ${DOWNLOAD_DIR}
-    else
-	echo "Download dir ${DOWNLOAD_DIR} is not empty"
-    fi
-}
-
-main(){
-    
-    download_packages
-    install_packages
-    remove_downloaded_files
-}
-
-main $@
-