Skip to content

Commit 1550f4d

Browse files
committed
checking python version before modifying env vars file
1 parent dfce5af commit 1550f4d

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

bare-metal/bootstrap-cluster.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,10 @@ install_sbcli_on_node() {
359359
pip install ${SBCLI_INSTALL_SOURCE} --upgrade
360360
"
361361
if [ -n "${SIMPLY_BLOCK_DOCKER_IMAGE+x}" ]; then
362-
ssh_exec "$node_ip" "sed -i \"s#^\(SIMPLY_BLOCK_DOCKER_IMAGE=\).*#\1${SIMPLY_BLOCK_DOCKER_IMAGE}#\" /usr/local/lib/python3.9/site-packages/simplyblock_core/env_var"
362+
ssh_exec "$node_ip" "PYVER=\$(python3 -c 'import sys; print(\"python{}.{}\".format(*sys.version_info[:2]))'); sed -i \"s#^\(SIMPLY_BLOCK_DOCKER_IMAGE=\).*#\1${SIMPLY_BLOCK_DOCKER_IMAGE}#\" /usr/local/lib/\${PYVER}/site-packages/simplyblock_core/env_var"
363363
fi
364364
if [ -n "${SIMPLY_BLOCK_SPDK_ULTRA_IMAGE+x}" ]; then
365-
ssh_exec "$node_ip" "sed -i \"s#^\(SIMPLY_BLOCK_SPDK_ULTRA_IMAGE=\).*#\1${SIMPLY_BLOCK_SPDK_ULTRA_IMAGE}#\" /usr/local/lib/python3.9/site-packages/simplyblock_core/env_var"
365+
ssh_exec "$node_ip" "PYVER=\$(python3 -c 'import sys; print(\"python{}.{}\".format(*sys.version_info[:2]))'); sed -i \"s#^\(SIMPLY_BLOCK_SPDK_ULTRA_IMAGE=\).*#\1${SIMPLY_BLOCK_SPDK_ULTRA_IMAGE}#\" /usr/local/lib/\${PYVER}/site-packages/simplyblock_core/env_var"
366366
fi
367367

368368
# sbcli configure
@@ -492,7 +492,7 @@ cleanup_and_reboot() {
492492
pip uninstall -y ${SBCLI_CMD} || { echo \"Error: Failed to uninstall ${SBCLI_CMD}\";}
493493
494494
rm -rf /usr/local/bin/sbc*
495-
rm -rf /usr/local/lib/python3.9/site-packages/simplyblock*
495+
PYVER=\$(python3 -c 'import sys; print("python{}.{}".format(*sys.version_info[:2]))') && rm -rf /usr/local/lib/\${PYVER}/site-packages/simplyblock* || true
496496
497497
"
498498
done

0 commit comments

Comments
 (0)