Skip to content

Commit 56d21e1

Browse files
committed
[2024.1-only] Synchronise with latest kayobe
Change-Id: Ice2551c023db9674d6fd6596209bda3af8df60d6
1 parent 982bfae commit 56d21e1

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

etc/kayobe/infra-vms.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@
3131

3232
# Base image for the infra VM root volume. Default is
3333
# "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
34-
# when os_distribution is "ubuntu", or
35-
# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
36-
# when os_distribution is "rocky",
37-
# or
34+
# when os_distribution is "ubuntu",
35+
# "https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
36+
# when os_distribution is "rocky" and seed_vm_boot_firmware is "efi",
37+
# "https://dl.rockylinux.org/vault/rocky/9.3/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
38+
# when os_distribution is "rocky" and seed_vm_boot_firmware is not "efi"
39+
# (default is "bios"), or
3840
# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2"
3941
# otherwise.
4042
#infra_vm_root_image:
@@ -58,6 +60,12 @@
5860
# OS family. Needed for config drive generation.
5961
#infra_vm_os_family:
6062

63+
# Boot firmware. Possible values are 'bios' or 'efi'. Default is 'bios'.
64+
#infra_vm_boot_firmware:
65+
66+
# Machine type. Libvirt default configuration is used.
67+
#infra_vm_machine:
68+
6169
###############################################################################
6270
# Infrastructure VM node configuration.
6371

etc/kayobe/seed-vm.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,11 @@
3232
# Base image for the seed VM root volume. Default is
3333
# "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
3434
# when os_distribution is "ubuntu",
35-
# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
36-
# when os_distribution is "rocky",
37-
# or
35+
# "https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
36+
# when os_distribution is "rocky" and seed_vm_boot_firmware is "efi",
37+
# "https://dl.rockylinux.org/vault/rocky/9.3/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
38+
# when os_distribution is "rocky" and seed_vm_boot_firmware is not "efi"
39+
# (default is "bios"), or
3840
# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2"
3941
# otherwise.
4042
#seed_vm_root_image:
@@ -61,6 +63,12 @@
6163
#
6264
#seed_vm_interfaces:
6365

66+
# Boot firmware. Possible values are 'bios' or 'efi'. Default is 'bios'.
67+
#seed_vm_boot_firmware:
68+
69+
# Machine type. Libvirt default configuration is used.
70+
#seed_vm_machine:
71+
6472
###############################################################################
6573
# Dummy variable to allow Ansible to accept this file.
6674
workaround_ansible_issue_8743: yes

0 commit comments

Comments
 (0)