From 57e7b5aebcc013ce030c8779c613d94571734551 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 27 Sep 2023 09:18:30 +0200 Subject: [PATCH] overlay coreos-base/oem-openstack: add oem-openstack Signed-off-by: Mathieu Tortuyaux --- build_library/vm_image_util.sh | 10 ++++++---- ...s-0-r1.ebuild => common-oem-files-0-r2.ebuild} | 1 + .../coreos-base/misc-files/files/oems/openstack | 2 ++ .../coreos-base/oem-openstack/metadata.xml | 4 ++++ .../oem-openstack/oem-openstack-0.ebuild | 15 +++++++++++++++ 5 files changed, 28 insertions(+), 4 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/{common-oem-files-0-r1.ebuild => common-oem-files-0-r2.ebuild} (99%) create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/oems/openstack create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-openstack/metadata.xml create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-openstack/oem-openstack-0.ebuild diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh index 987d8b53a0..e0adb9543f 100644 --- a/build_library/vm_image_util.sh +++ b/build_library/vm_image_util.sh @@ -47,10 +47,10 @@ VALID_OEM_PACKAGES=( cloudsigma cloudstack digitalocean - ec2-compat exoscale gce hyperv + openstack packet qemu rackspace @@ -229,16 +229,18 @@ IMG_ami_OEM_USE=ami IMG_ami_OEM_PACKAGE=common-oem-files IMG_ami_OEM_SYSEXT=oem-ami -## openstack, supports ec2's metadata format so use oem-ec2-compat +## openstack IMG_openstack_DISK_FORMAT=qcow2 IMG_openstack_DISK_LAYOUT=vm -IMG_openstack_OEM_PACKAGE=oem-ec2-compat +IMG_openstack_OEM_PACKAGE=common-oem-files IMG_openstack_OEM_USE=openstack +IMG_openstack_OEM_SYSEXT=oem-openstack ## openstack but without a resized root partition for more flexibility IMG_openstack_mini_DISK_FORMAT=qcow2 -IMG_openstack_mini_OEM_PACKAGE=oem-ec2-compat +IMG_openstack_mini_OEM_PACKAGE=common-oem-files IMG_openstack_mini_OEM_USE=openstack +IMG_openstack_mini_OEM_SYSEXT=oem-openstack ## brightbox, supports ec2's metadata format so use oem-ec2-compat IMG_brightbox_DISK_FORMAT=qcow2 diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r2.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r2.ebuild index 8442b84a3d..124bb73471 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r2.ebuild @@ -6,6 +6,7 @@ EAPI=8 OEMIDS=( ami azure + openstack qemu vmware ) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/oems/openstack b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/oems/openstack new file mode 100644 index 0000000000..c5f3a2a8b7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/oems/openstack @@ -0,0 +1,2 @@ +/etc/systemd/system/multi-user.target.requires/coreos-metadata-sshkeys@core.service +/oem/base/ diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-openstack/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-openstack/metadata.xml new file mode 100644 index 0000000000..097975e3ad --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-openstack/metadata.xml @@ -0,0 +1,4 @@ + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-openstack/oem-openstack-0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-openstack/oem-openstack-0.ebuild new file mode 100644 index 0000000000..88e7440230 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-openstack/oem-openstack-0.ebuild @@ -0,0 +1,15 @@ +# Copyright (c) 2020 Kinvolk GmbH. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="OpenStack suite for OpenStack" +HOMEPAGE="https://www.openstack.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm64" +IUSE="" + +OEM_NAME="Openstack"