Skip to content

Updated platformid to force openstack for s390x on 4.2 #1004

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
jlebon merged 2 commits into from
Dec 18, 2019
Merged

Updated platformid to force openstack for s390x on 4.2 #1004

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb0ec05
Force s390x qemu image to default to openstack config drive approach
jaypoulz Dec 17, 2019
92e2c47
Added links to online discussion around the issue
jaypoulz Dec 18, 2019
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
13 changes: 12 additions & 1 deletion src/cmd-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,10 +242,21 @@ img_base=tmp/${imageprefix}-base.qcow2
# forgive me for this sin
checksum_location=$(find /usr/lib/coreos-assembler-anaconda/ -name '*CHECKSUM' | head -1)

# Hack to force qemu to default to config drive based install on s390x
Copy link
Member

@jlebon jlebon Dec 18, 2019

Choose a reason for hiding this comment

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

Link to some of the PRs where discussions took place here?

# See these PRs for relevant discussion:
# Long term feature request - https://github.com/coreos/ignition/issues/825
# Short term workaround in ignition - https://github.com/coreos/ignition/pull/905
# Related/Alternative Hack to dracut - https://github.com/coreos/ignition-dracut/pull/145
# Multi-Arch 4.2 CoreOS workaround - https://github.com/coreos/coreos-assembler/pull/1004
platformid=qemu
if [ "$arch" == "s390x" ]; then
platformid=openstack
fi

if [ -n "${build_qemu}" ]; then
img_qemu=${imageprefix}-qemu.qcow2
run_virtinstall "${tmprepo}" "${ref}" "${PWD}"/"${img_base}" --variant=cloud
/usr/lib/coreos-assembler/gf-platformid "$(pwd)"/"${img_base}" "$(pwd)"/"${img_qemu}" qemu
/usr/lib/coreos-assembler/gf-platformid "$(pwd)"/"${img_base}" "$(pwd)"/"${img_qemu}" ${platformid}
fi

"${dn}"/write-commit-object "${tmprepo}" "${commit}" "$(pwd)"
Expand Down