Skip to content
This repository was archived by the owner on Mar 20, 2023. It is now read-only.

Commit 85985d6

Browse files
committed
Update shared file systems installers
- Fix BeeGFS Beeond provisioning on CentOS - Disallow Ubuntu 18.04 autoscratch due to incompatibility - Update GlusterFS to supported versions
1 parent a54f872 commit 85985d6

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

scripts/shipyard_nodeprep.sh

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ set -o pipefail
99
DOCKER_CE_VERSION_DEBIAN=19.03.5
1010
DOCKER_CE_VERSION_CENTOS=19.03.5
1111
DOCKER_CE_VERSION_SLES=17.09.1
12-
GLUSTER_VERSION_DEBIAN=4.1
13-
GLUSTER_VERSION_CENTOS=41
14-
IMDS_VERSION=2019-03-11
12+
GLUSTER_VERSION_DEBIAN=7
13+
GLUSTER_VERSION_CENTOS=6
14+
IMDS_VERSION=2019-04-30
1515

1616
# consts
1717
DOCKER_CE_PACKAGE_DEBIAN="5:${DOCKER_CE_VERSION_DEBIAN}~3-0~"
@@ -1409,27 +1409,31 @@ install_beeond() {
14091409
if { [ "$DISTRIB_ID" == "debian" ] && [ "$DISTRIB_RELEASE" == "9" ]; } || { [ "$DISTRIB_ID" == "ubuntu" ] && [ "$DISTRIB_RELEASE" == "16.04" ]; } then
14101410
pkgnum=9
14111411
elif [ "$DISTRIB_ID" == "ubuntu" ] && [ "$DISTRIB_RELEASE" == "18.04" ]; then
1412-
# TODO temporarily use 9 until debian 10 repo releases
1413-
pkgnum=9
1412+
logger ERROR "BeeGFS BeeOND is not supported on Ubuntu 18.04"
1413+
exit 1
14141414
fi
14151415
download_file_as "https://www.beegfs.io/release/latest-stable/dists/beegfs-deb${pkgnum}.list" "/etc/apt/sources.list.d/beegfs-deb${pkgnum}.list"
14161416
add_repo "https://www.beegfs.io/release/latest-stable/gpg/DEB-GPG-KEY-beegfs"
14171417
led=libelf-dev
14181418
elif [ "$PACKAGER" == "yum" ]; then
14191419
if [[ "$DISTRIB_RELEASE" == 7* ]]; then
14201420
pkgnum=7
1421+
elif [[ "$DISTRIB_RELEASE" == 8* ]]; then
1422+
pkgnum=8
14211423
fi
14221424
download_file_as "https://www.beegfs.io/release/latest-stable/dists/beegfs-rhel${pkgnum}.repo" "/etc/yum.repos.d/beegfs-rhel${pkgnum}.repo"
14231425
rpm --import "https://www.beegfs.io/release/latest-stable/gpg/RPM-GPG-KEY-beegfs"
1424-
install_kernel_devel_package
14251426
led=elfutils-libelf-devel
1427+
install_kernel_devel_package
1428+
install_packages epel-release
14261429
fi
14271430
refresh_package_index
1428-
install_packages beeond $led
1431+
install_packages dkms beeond $led
14291432
logger INFO "BeeGFS BeeOND installed"
14301433
}
14311434

14321435
install_glusterfs_on_compute() {
1436+
log DEBUG "Installing GlusterFS on compute"
14331437
local gfsstart="systemctl start glusterd"
14341438
local gfsenable="systemctl enable glusterd"
14351439
if [ "$PACKAGER" == "zypper" ]; then
@@ -1457,6 +1461,7 @@ install_glusterfs_on_compute() {
14571461
$gfsstart
14581462
# create brick directory
14591463
mkdir -p "${USER_MOUNTPOINT}"/gluster
1464+
log INFO "GlusterFS on compute installed"
14601465
}
14611466

14621467
check_for_storage_cluster_software() {

scripts/shipyard_remotefs_bootstrap.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -o pipefail
66
export DEBIAN_FRONTEND=noninteractive
77

88
# constants
9-
GLUSTER_VERSION=4.1
9+
GLUSTER_VERSION=7
1010
gluster_brick_mountpath=/gluster/brick
1111
gluster_brick_location=$gluster_brick_mountpath/brick0
1212
ipaddress=$(ip addr list eth0 | grep "inet " | cut -d' ' -f6 | cut -d/ -f1)

0 commit comments

Comments
 (0)