From 01d3214624965636e8167113e7184c76486b34b6 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Thu, 16 Nov 2023 18:36:08 +0100 Subject: [PATCH] Use OpenStack image for Brightbox The special Brightbox image uses the OpenStack userdata in Ignition but lacked Afterburn usage. It actually works to use the OpenStack image and directly which also enables Afterburn, thus we can drop the special image. Don't build a special image for Brightbox but recommend to use OpenStack images directly. A symlink is added to help with the download of hardcoded user scripts. --- build_library/vm_image_util.sh | 7 ------- changelog/changes/2023-11-14-brightbox.md | 2 ++ ci-automation/vms.sh | 1 + .../oem-ec2-compat/files/grub-brightbox.cfg | 3 --- .../oem-ec2-compat/oem-ec2-compat-0.1.2-r4.ebuild | 10 ++-------- 5 files changed, 5 insertions(+), 18 deletions(-) create mode 100644 changelog/changes/2023-11-14-brightbox.md delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-brightbox.cfg diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh index 987d8b53a0..c1a332a601 100644 --- a/build_library/vm_image_util.sh +++ b/build_library/vm_image_util.sh @@ -9,7 +9,6 @@ VALID_IMG_TYPES=( ami ami_vmdk azure - brightbox cloudsigma cloudstack cloudstack_vhd @@ -240,12 +239,6 @@ IMG_openstack_mini_DISK_FORMAT=qcow2 IMG_openstack_mini_OEM_PACKAGE=oem-ec2-compat IMG_openstack_mini_OEM_USE=openstack -## brightbox, supports ec2's metadata format so use oem-ec2-compat -IMG_brightbox_DISK_FORMAT=qcow2 -IMG_brightbox_DISK_LAYOUT=vm -IMG_brightbox_OEM_PACKAGE=oem-ec2-compat -IMG_brightbox_OEM_USE=brightbox - ## pxe, which is an cpio image IMG_pxe_DISK_FORMAT=cpio IMG_pxe_PARTITIONED_IMG=0 diff --git a/changelog/changes/2023-11-14-brightbox.md b/changelog/changes/2023-11-14-brightbox.md new file mode 100644 index 0000000000..a5efcd87bd --- /dev/null +++ b/changelog/changes/2023-11-14-brightbox.md @@ -0,0 +1,2 @@ +- Brightbox: The regular OpenStack image should now be used, it includes Afterburn for instance metadata attributes +- OpenStack: An uncompressed image is provided for simpler import (since the images use qcow2 inline compression, there is no benefit in using the `.gz` or `.bz2` images) diff --git a/ci-automation/vms.sh b/ci-automation/vms.sh index f796df6a83..e35bc577a3 100644 --- a/ci-automation/vms.sh +++ b/ci-automation/vms.sh @@ -150,6 +150,7 @@ function _vm_build_impl() { -v "${vernum}" \ mv "${CONTAINER_IMAGE_ROOT}/${arch}-usr/" "./${images_out}/" + ( cd images/latest ; ln -s flatcar_production_openstack_image.img.bz2 flatcar_production_brightbox_image.img.bz2 ) create_digests "${SIGNER}" "images/latest/"* sign_artifacts "${SIGNER}" "images/latest/"* copy_to_buildcache "images/${arch}/${vernum}/" "images/latest/"* diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-brightbox.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-brightbox.cfg deleted file mode 100644 index 2d41cdd4ec..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-brightbox.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Flatcar GRUB settings for EC2 - -set oem_id="brightbox" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r4.ebuild index a717f398b1..6545333ebc 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r4.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r4.ebuild @@ -10,8 +10,8 @@ SRC_URI="" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 arm64 x86" -IUSE="openstack brightbox" -REQUIRED_USE="^^ ( openstack brightbox )" +IUSE="openstack" +REQUIRED_USE="^^ ( openstack )" # no source directory S="${WORKDIR}" @@ -22,10 +22,6 @@ src_prepare() { ID="openstack" NAME="Openstack" HOME_URL="https://www.openstack.org/" - elif use brightbox ; then - ID="brightbox" - NAME="Brightbox" - HOME_URL="http://brightbox.com/" else die "Unknown OEM!" fi @@ -42,8 +38,6 @@ src_install() { doins "${T}/oem-release" if use openstack ; then newins "${FILESDIR}/grub-openstack.cfg" grub.cfg - elif use brightbox ; then - newins "${FILESDIR}/grub-brightbox.cfg" grub.cfg fi insinto "/oem/base"