Skip to content

Bug 1870369: Fix gather bootstrap command #11120

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

Closed
rna-afk wants to merge 1 commit into from
Closed

Bug 1870369: Fix gather bootstrap command #11120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 13 additions & 6 deletions ci-operator/step-registry/upi/install/vsphere/upi-install-vsphere-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,10 @@ function gather_bootstrap_and_fail() {
done

# shellcheck disable=SC2154
GATHER_BOOTSTRAP_ARGS="${GATHER_BOOTSTRAP_ARGS} --bootstrap ${bootstrap_0_ip}"
# shellcheck disable=SC2154
GATHER_BOOTSTRAP_ARGS="${GATHER_BOOTSTRAP_ARGS} --master ${control_plane_0_ip} --master ${control_plane_1_ip} --master ${control_plane_2_ip}"
GATHER_BOOTSTRAP_ARGS=("--bootstrap ${bootstrap_0_ip}" "--master ${control_plane_0_ip} --master ${control_plane_1_ip} --master ${control_plane_2_ip}")

set -e
if test -n "${GATHER_BOOTSTRAP_ARGS}"; then
openshift-install --dir=/tmp/artifacts/installer gather bootstrap --key "${SSH_PRIVATE_KEY_PATH}" "${GATHER_BOOTSTRAP_ARGS}"
fi
openshift-install --dir=/tmp/artifacts/installer gather bootstrap --key "${SSH_PRIVATE_KEY_PATH}" "${GATHER_BOOTSTRAP_ARGS[@]}"

return 1
}
Expand Down Expand Up @@ -113,6 +109,17 @@ echo "$(date -u --rfc-3339=seconds) - terraform apply..."
terraform apply -auto-approve -no-color &
wait "$!"

echo "Testing terraform show values"
TERRAFORM_SHOW_DATA=$(terraform show -json | sed 's/,/\n/g')
control_plane_0_ip=$(echo "${TERRAFORM_SHOW_DATA}" | grep -Po '"body":"\{\\\"control-plane-0.*' | grep -Eo '([0-9]*\.){3}[0-9]*')
control_plane_1_ip=$(echo "${TERRAFORM_SHOW_DATA}" | grep -Po '"body":"\{\\\"control-plane-1.*' | grep -Eo '([0-9]*\.){3}[0-9]*')
control_plane_2_ip=$(echo "${TERRAFORM_SHOW_DATA}" | grep -Po '"body":"\{\\\"control-plane-2.*' | grep -Eo '([0-9]*\.){3}[0-9]*')
bootstrap_0_ip=$(echo "${TERRAFORM_SHOW_DATA}" | grep -Po '"body":"\{\\\"bootstrap-0.*' | grep -Eo '([0-9]*\.){3}[0-9]*')

echo Control Plane 0 ip $control_plane_0_ip
echo Control Plane 1 ip $control_plane_1_ip
echo Control Plane 2 ip $control_plane_2_ip
echo Bootstrap 0 ip $bootstrap_0_ip
# The terraform state could be larger than the maximum 1mb
# in a secret
tar -Jcf "${SHARED_DIR}/terraform_state.tar.xz" terraform.tfstate
Expand Down