Skip to content

e2e-metal: add pxe_kernel_args to tf vars #9960

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
openshift-merge-robot merged 1 commit into from
Jul 9, 2020
Merged

e2e-metal: add pxe_kernel_args to tf vars #9960

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
7 changes: 7 additions & 0 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,12 @@ objects:
PXE_KERNEL_URL="$(jq -r '.baseURI + .images["kernel"].path' /var/lib/openshift-install/rhcos.json)"
# 4.3 unified 'metal-bios' and 'metal-uefi' into just 'metal'
PXE_OS_IMAGE_URL="$(jq -r '.baseURI + (.images["metal-bios"].path // .images["metal"].path)' /var/lib/openshift-install/rhcos.json)"
if [[ $PXE_KERNEL_URL =~ "live" ]]; then
PXE_KERNEL_ARGS=""
else
PXE_KERNEL_ARGS="coreos.inst.image_url=${PXE_OS_IMAGE_URL}"
fi
# 4.3 unified 'metal-bios' and 'metal-uefi' into just 'metal', unused in 4.6
Copy link
Member

@cgwalters cgwalters Jul 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment seems misplaced, I think you mean to change the one above? But not worth a respin.

Copy link
Member Author

@sdodson sdodson Jul 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I'll clean that up in #10121

cat > /tmp/artifacts/terraform/terraform.tfvars <<-EOF
cluster_id = "${CLUSTER_NAME}"
bootstrap_ign_file = "/tmp/artifacts/installer/bootstrap.ign"
Expand All @@ -448,6 +454,7 @@ objects:
pxe_initrd_url = "${PXE_INITRD_URL}"
pxe_kernel_url = "${PXE_KERNEL_URL}"
pxe_os_image_url = "${PXE_OS_IMAGE_URL}"
pxe_kernel_args = "{PXE_KERNEL_ARGS}"
worker_count = "${workers}"
worker_ign_file = "/tmp/artifacts/installer/worker.ign"
EOF
Expand Down