Skip to content

fix: hyperconverged-lab.sh minor compatibility fixes #901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 13, 2025
Merged

fix: hyperconverged-lab.sh minor compatibility fixes #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2491ef5
fix: hyperconverged-lab.sh minor compatibility fixes
awfabian-rs Mar 13, 2025
92c7b0b
Merge branch 'main' into hyperconverged-2
cloudnull Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/setup-openstack-rc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if ! yq --version 2> /dev/null; then
installYq
fi

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"
Expand Down
3 changes: 2 additions & 1 deletion scripts/hyperconverged-lab.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ EOC
# Run Genestack post setup
ssh -o ForwardAgent=yes -o UserKnownHostsFile=/dev/null -t ${SSH_USERNAME}@${JUMP_HOST_VIP} <<EOC
set -e
sudo /opt/genestack/bin/setup-openstack-rc.sh
sudo bash <<HERE
sudo /opt/genestack/bin/setup-openstack-rc.sh
source /opt/genestack/scripts/genestack.rc
if ! openstack --os-cloud default flavor show hyperconverged-test; then
Expand Down Expand Up @@ -691,6 +691,7 @@ if ! openstack --os-cloud default subnet show flat_subnet; then
--network flat \
flat_subnet
fi
HERE
EOC

echo "The lab is now ready for use and took ${SECONDS} seconds to complete."
Expand Down
Loading