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

@@ -9,7 +9,6 @@ VALID_IMG_TYPES=(
     ami
     ami_vmdk
     azure
-    brightbox
     cloudsigma
     cloudstack
     cloudstack_vhd
@@ -223,12 +222,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

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)

ci-automation/vms.sh

@@ -140,6 +140,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/"*

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-brightbox.cfg

@@ -1,3 +0,0 @@
-# Flatcar GRUB settings for EC2
-
-set oem_id="brightbox"

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r2.ebuild

@@ -10,8 +10,8 @@ SRC_URI=""
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 arm64 x86"
-IUSE="ec2 openstack brightbox"
-REQUIRED_USE="^^ ( ec2 openstack brightbox )"
+IUSE="ec2 openstack"
+REQUIRED_USE="^^ ( ec2 openstack )"
 
 RDEPEND="
 	ec2? ( app-emulation/amazon-ssm-agent )
@@ -32,10 +32,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
@@ -54,8 +50,6 @@ src_install() {
 		newins "${FILESDIR}/grub-ec2.cfg" grub.cfg
 	elif use openstack ; then
 		newins "${FILESDIR}/grub-openstack.cfg" grub.cfg
-	elif use brightbox ; then
-		newins "${FILESDIR}/grub-brightbox.cfg" grub.cfg
 	fi
 
 	insinto "/usr/share/oem/base"