From 56d21e121434d5a3352db77ab0377fd2ed8a3cfd Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Mon, 16 Sep 2024 18:39:48 +0200
Subject: [PATCH] [2024.1-only] Synchronise with latest kayobe

Change-Id: Ice2551c023db9674d6fd6596209bda3af8df60d6
---
 etc/kayobe/infra-vms.yml | 16 ++++++++++++----
 etc/kayobe/seed-vm.yml   | 14 +++++++++++---
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/etc/kayobe/infra-vms.yml b/etc/kayobe/infra-vms.yml
index a8f1fd9b2..e48004103 100644
--- a/etc/kayobe/infra-vms.yml
+++ b/etc/kayobe/infra-vms.yml
@@ -31,10 +31,12 @@
 
 # Base image for the infra VM root volume. Default is
 # "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
-# when os_distribution is "ubuntu", or
-# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
-# when os_distribution is "rocky",
-# or
+# when os_distribution is "ubuntu",
+# "https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
+# when os_distribution is "rocky" and seed_vm_boot_firmware is "efi",
+# "https://dl.rockylinux.org/vault/rocky/9.3/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
+# when os_distribution is "rocky" and seed_vm_boot_firmware is not "efi"
+# (default is "bios"), or
 # "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2"
 # otherwise.
 #infra_vm_root_image:
@@ -58,6 +60,12 @@
 # OS family. Needed for config drive generation.
 #infra_vm_os_family:
 
+# Boot firmware. Possible values are 'bios' or 'efi'. Default is 'bios'.
+#infra_vm_boot_firmware:
+
+# Machine type. Libvirt default configuration is used.
+#infra_vm_machine:
+
 ###############################################################################
 # Infrastructure VM node configuration.
 
diff --git a/etc/kayobe/seed-vm.yml b/etc/kayobe/seed-vm.yml
index f10fbaa19..42aea8da5 100644
--- a/etc/kayobe/seed-vm.yml
+++ b/etc/kayobe/seed-vm.yml
@@ -32,9 +32,11 @@
 # Base image for the seed VM root volume. Default is
 # "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
 # when os_distribution is "ubuntu",
-# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
-# when os_distribution is "rocky",
-# or
+# "https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
+# when os_distribution is "rocky" and seed_vm_boot_firmware is "efi",
+# "https://dl.rockylinux.org/vault/rocky/9.3/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
+# when os_distribution is "rocky" and seed_vm_boot_firmware is not "efi"
+# (default is "bios"), or
 # "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2"
 # otherwise.
 #seed_vm_root_image:
@@ -61,6 +63,12 @@
 #
 #seed_vm_interfaces:
 
+# Boot firmware. Possible values are 'bios' or 'efi'. Default is 'bios'.
+#seed_vm_boot_firmware:
+
+# Machine type. Libvirt default configuration is used.
+#seed_vm_machine:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes