diff options
| author |  Neal Gompa <ngompa@fedoraproject.org>
| 2023-12-21 09:04:37 -0500 |
|---|---|---|
| committer | Neal Gompa <ngompa@fedoraproject.org>
| 2023-12-21 09:04:37 -0500 |
| commit | e6896b13c2757e3b36a574f83fffc74922470132 (patch) | |
| tree | 160ba52712a1e49c09797e01f1e7a428061d5b7f /platforms/vagrant.xml | |
| parent | f9b944d050c3d57cf858b1462fe22840563687ea (diff) | |
| download | kiwi-descriptions-e6896b13c2757e3b36a574f83fffc74922470132.tar.gz kiwi-descriptions-e6896b13c2757e3b36a574f83fffc74922470132.zip | |
platforms, tmt: Rename and restructure cloud variants
We now have more than one cloud system that is essentially a KVM
environment that uses cloud-init to boot, so now we declare that
"generic" and have the OpenStack and Oracle images reuse those
definitions.
Also, in preparation for layered cloud image variants, rename
them from "Cloud-" to "Cloud-Base-". Vagrant variants are
similarly prefixed to make it clear who provides them.
Finally, restructure the layout of the tmt plans to match the
description structure.
Diffstat (limited to 'platforms/vagrant.xml')
| -rw-r--r-- | platforms/vagrant.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/platforms/vagrant.xml b/platforms/vagrant.xml index 5dc45bf..9c784ff 100644 --- a/platforms/vagrant.xml +++ b/platforms/vagrant.xml @@ -3,14 +3,14 @@ <profile name="VagrantCore" description="Vagrant core packages"> <requires profile="CloudCore"/> </profile> - <profile name="Vagrant-libvirt" description="Vagrant guest image for libvirt"> + <profile name="Cloud-Base-Vagrant-libvirt" description="Vagrant Base guest image for libvirt"> <requires profile="VagrantCore"/> </profile> - <profile name="Vagrant-VirtualBox" description="Vagrant guest image for VirtualBox"> + <profile name="Cloud-Base-Vagrant-VirtualBox" description="Vagrant Base guest image for VirtualBox"> <requires profile="VagrantCore"/> </profile> </profiles> - <preferences profiles="Vagrant-libvirt"> + <preferences profiles="Cloud-Base-Vagrant-libvirt"> <type image="oem" filesystem="btrfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" devicepersistency="by-uuid" bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" format="vagrant" fsmountoptions="compress=zstd:1" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora"> <bootloader name="grub2" console="serial" timeout="1"/> <size unit="G">5</size> @@ -25,7 +25,7 @@ </oemconfig> </type> </preferences> - <preferences profiles="Vagrant-VirtualBox"> + <preferences profiles="Cloud-Base-Vagrant-VirtualBox"> <type image="oem" filesystem="btrfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" devicepersistency="by-uuid" bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" format="vagrant" fsmountoptions="compress=zstd:1" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora"> <bootloader name="grub2" console="serial" timeout="1"/> <size unit="G">5</size> @@ -52,10 +52,10 @@ <package name="gdisk"/> <package name="glibc-langpack-en"/> </packages> - <packages type="image" patternType="plusRecommended" profiles="Vagrant-libvirt"> + <packages type="image" patternType="plusRecommended" profiles="Cloud-Base-Vagrant-libvirt"> <package name="qemu-guest-agent"/> </packages> - <packages type="image" patternType="plusRecommended" profiles="Vagrant-VirtualBox"> + <packages type="image" patternType="plusRecommended" profiles="Cloud-Base-Vagrant-VirtualBox"> <package name="virtualbox-guest-additions"/> </packages> <packages type="uninstall" profiles="VagrantCore"> |