From 2491ef5c7256a20925582c08ae3dec99a03b7935 Mon Sep 17 00:00:00 2001
From: Adam Fabian <adam.fabian@rackspace.com>
Date: Thu, 13 Mar 2025 12:42:57 -0500
Subject: [PATCH] fix: hyperconverged-lab.sh minor compatibility fixes

---
 bin/setup-openstack-rc.sh     | 2 +-
 scripts/hyperconverged-lab.sh | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/setup-openstack-rc.sh b/bin/setup-openstack-rc.sh
index b738e2a46..393a0aab3 100755
--- a/bin/setup-openstack-rc.sh
+++ b/bin/setup-openstack-rc.sh
@@ -9,7 +9,7 @@ function installYq() {
 
 yq --version || (echo "yq is not installed. Attempting to install yq" && installYq)
 
-USER_NAME="$(who am i | awk '{print $1}')"
+USER_NAME="$(whoami)"
 USER_PATH="$(getent passwd ${USER_NAME} | awk -F':' '{print $6}')"
 CONFIG_PATH="${USER_PATH}/.config/openstack"
 CONFIG_FILE="${CONFIG_PATH}/genestack-clouds.yaml"
diff --git a/scripts/hyperconverged-lab.sh b/scripts/hyperconverged-lab.sh
index aa4b4fd3c..c2b71e680 100755
--- a/scripts/hyperconverged-lab.sh
+++ b/scripts/hyperconverged-lab.sh
@@ -719,8 +719,9 @@ EOC
 
 # Run Genestack post setup
 ssh -o ForwardAgent=yes -o UserKnownHostsFile=/dev/null -t ubuntu@${JUMP_HOST_VIP} <<EOC
-sudo /opt/genestack/bin/setup-openstack-rc.sh
+sudo bash <<HERE
 source /opt/genestack/scripts/genestack.rc
+/opt/genestack/bin/setup-openstack-rc.sh
 openstack --os-cloud default flavor create hyperconverged-test \
           --public \
           --ram 2048 \
@@ -741,6 +742,7 @@ openstack --os-cloud default subnet create \
           --dhcp \
           --network flat \
           flat_subnet
+HERE
 EOC
 
 echo "This is the jump host address ${JUMP_HOST_VIP}, write this down."