Merge pull request #30 from stackhpc/openhpc-update

Update for OpenHPC element

Author: oneswig

elements/openhpc/README.rst

@@ -3,18 +3,34 @@ openhpc
 =======
 Install OpenHPC RPMs from a repo using ``yum``.
 
+* ``DIB_OPENHPC_VERSION`` Specify the version of OpenHPC to install.  OpenHPC 1.3
+  is based on CentOS 7, and OpenHPC 2.0 is based on CentOS 8.  Default is ``2.0``
+
+* ``DIB_OPENHPC_REPO_RPM`` Override default settings for the URL for the OpenHPC repo
+  RPM package.
+
+  For OpenHPC 1.3 the default is https://github.com/openhpc/ohpc/releases/download/v1.3.GA/ohpc-release-1.3-1.el7.x86_64.rpm
+
+  For OpenHPC 2.0 the default is http://repos.openhpc.community/OpenHPC/2/CentOS_8/x86_64/ohpc-release-2-1.el8.x86_64.rpm
+
 * ``DIB_OPENHPC_GRPLIST`` Define a space-separated list of package groups to install.
-  Default is:
+  Default for OpenHPC 1.3 is:
 
   ``ohpc-base-compute ohpc-slurm-client "InfiniBand Support"``
 
+  Default for OpenHPC 2.0 is no groups.
+
   Set to an empty string to install no package groups
 
 * ``DIB_OPENHPC_PKGLIST`` Define a space-separated list of packages to install.
-  Default is:
+  Default is for OpenHPC 1.3 is:
 
   ``lmod-ohpc mrsh-ohpc lustre-client-ohpc``
 
+  Default for OpenHPC 2.0 is:
+
+  ``ohpc-base lmod-ohpc ohpc-slurm-client ohpc-gnu9-runtimes openmpi4-gnu9-ohpc``
+
   Set to an empty string to install no individual packages
 
 * ``DIB_OPENHPC_DELETE_REPO`` Set to ``y`` or ``Y`` to delete the repo after building the image.

elements/openhpc/environment.d/openhpc

@@ -1,5 +1,26 @@
 #!/bin/bash
 
-export OPENHPC_GRPLIST=${DIB_OPENHPC_GRPLIST:-"ohpc-base-compute ohpc-slurm-client 'InfiniBand Support'"}
-export OPENHPC_PKGLIST=${DIB_OPENHPC_PKGLIST:-"lmod-ohpc mrsh-ohpc lustre-client-ohpc"}
+# Choose from one of a couple of pre-defined repo RPM values
+case ${DIB_OPENHPC_VERSION:="2.0"} in
+    "1.3")
+	export OPENHPC_REPO_RPM="https://github.com/openhpc/ohpc/releases/download/v1.3.GA/ohpc-release-1.3-1.el7.x86_64.rpm"
+	export OPENHPC_PKGMGR="yum"
+	export OPENHPC_GRPLIST=${DIB_OPENHPC_GRPLIST:-"ohpc-base-compute ohpc-slurm-client 'InfiniBand Support'"}
+	export OPENHPC_PKGLIST=${DIB_OPENHPC_PKGLIST:-"lmod-ohpc mrsh-ohpc lustre-client-ohpc"}
+	;;
+    "2.0")
+	export OPENHPC_REPO_RPM="http://repos.openhpc.community/OpenHPC/2/CentOS_8/x86_64/ohpc-release-2-1.el8.x86_64.rpm"
+	export OPENHPC_PKGMGR="dnf"
+	export OPENHPC_GRPLIST=${DIB_OPENHPC_GRPLIST:-""}
+	export OPENHPC_PKGLIST=${DIB_OPENHPC_PKGLIST:-"ohpc-base lmod-ohpc ohpc-slurm-client ohpc-gnu9-runtimes openmpi4-gnu9-ohpc"}
+	;;
+    "*")
+	echo "Unrecognised/unsupported version of OpenHPC requested: $DIB_OPENHPC_VERSION"
+	exit -1;;
+esac
+export DIB_OPENHPC_VERSION
+
+# A URL for the repo RPM can be supplied directly
+[[ ! -z "${DIB_OPENHPC_REPO_RPM:-}" ]] && export OPENHPC_REPO_RPM=$DIB_OPENHPC_REPO_RPM
+
 export OPENHPC_DELETE_REPO=${DIB_OPENHPC_DELETE_REPO:-n}

elements/openhpc/install.d/92-install-ohpc-packages

@@ -6,5 +6,5 @@ fi
 set -eu
 set -o pipefail
 
-[ ! -z "$OPENHPC_GRPLIST" ] && yum groupinstall -y $OPENHPC_GRPLIST
-[ ! -z "$OPENHPC_PKGLIST" ] && yum install -y $OPENHPC_PKGLIST
+[ ! -z "$OPENHPC_GRPLIST" ] && $OPENHPC_PKGMGR groupinstall -y $OPENHPC_GRPLIST
+[ ! -z "$OPENHPC_PKGLIST" ] && $OPENHPC_PKGMGR install -y $OPENHPC_PKGLIST

elements/openhpc/post-install.d/93-openhpc-cleanup

@@ -8,7 +8,7 @@ set -o pipefail
 
 if [ "$OPENHPC_DELETE_REPO" = "y" -o "$OPENHPC_DELETE_REPO" = "Y" ]
 then
-    rm -f /etc/yum.repos.d/OpenHPC.repo
+    $OPENHPC_PKGMGR remove ohpc-release
 fi
 
-systemctl enable ntpd.service
+#systemctl enable ntpd.service

elements/openhpc/pre-install.d/91-install-ohpc-repo

@@ -7,4 +7,9 @@ set -eu
 set -o pipefail
 
 [ -d /etc/yum.repos.d ] || exit -1
-yum install -y https://github.com/openhpc/ohpc/releases/download/v1.3.GA/ohpc-release-1.3-1.el7.x86_64.rpm
+${OPENHPC_PKGMGR} install -y ${OPENHPC_REPO_RPM}
+
+if [ "$DIB_OPENHPC_VERSION" = "2.0" ]
+then
+    ${OPENHPC_PKGMGR} config-manager --set-enabled powertools
+fi