Skip to content

Commit 87ff566

Browse files
committed
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.
1 parent 9354473 commit 87ff566

File tree

10 files changed

+3
-93
lines changed

10 files changed

+3
-93
lines changed

build_library/vm_image_util.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ VALID_IMG_TYPES=(
99
ami
1010
ami_vmdk
1111
azure
12-
brightbox
1312
cloudsigma
1413
cloudstack
1514
cloudstack_vhd
@@ -242,12 +241,6 @@ IMG_openstack_mini_OEM_PACKAGE=common-oem-files
242241
IMG_openstack_mini_OEM_USE=openstack
243242
IMG_openstack_mini_OEM_SYSEXT=oem-openstack
244243

245-
## brightbox, supports ec2's metadata format so use oem-ec2-compat
246-
IMG_brightbox_DISK_FORMAT=qcow2
247-
IMG_brightbox_DISK_LAYOUT=vm
248-
IMG_brightbox_OEM_PACKAGE=oem-ec2-compat
249-
IMG_brightbox_OEM_USE=brightbox
250-
251244
## pxe, which is an cpio image
252245
IMG_pxe_DISK_FORMAT=cpio
253246
IMG_pxe_PARTITIONED_IMG=0
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- Brightbox: The regular OpenStack image should now be used, it includes Afterburn for instance metadata attributes
2+
- 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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ function _vm_build_impl() {
150150
-v "${vernum}" \
151151
mv "${CONTAINER_IMAGE_ROOT}/${arch}-usr/" "./${images_out}/"
152152

153+
( cd images/latest ; ln -s flatcar_production_openstack_image.img.bz2 flatcar_production_brightbox_image.img.bz2 )
153154
create_digests "${SIGNER}" "images/latest/"*
154155
sign_artifacts "${SIGNER}" "images/latest/"*
155156
copy_to_buildcache "images/${arch}/${vernum}/" "images/latest/"*

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/README

Lines changed: 0 additions & 4 deletions
This file was deleted.

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/openstack.ign

Lines changed: 0 additions & 13 deletions
This file was deleted.

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

Lines changed: 0 additions & 3 deletions
This file was deleted.

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

Lines changed: 0 additions & 3 deletions
This file was deleted.

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/oem-release

Lines changed: 0 additions & 5 deletions
This file was deleted.

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/metadata.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

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

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)