From 9629cccc91f892dc0bf4b982e9a565bcb3bc489b Mon Sep 17 00:00:00 2001 From: Kurt Garloff Date: Fri, 23 May 2025 09:15:35 +0200 Subject: [PATCH 1/3] Fix #226: diskBus and scsiModeul are below hardware. Signed-off-by: Kurt Garloff --- providers/openstack/scs/cluster-class/templates/image.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/providers/openstack/scs/cluster-class/templates/image.yaml b/providers/openstack/scs/cluster-class/templates/image.yaml index e515484b..09f728c9 100644 --- a/providers/openstack/scs/cluster-class/templates/image.yaml +++ b/providers/openstack/scs/cluster-class/templates/image.yaml @@ -10,8 +10,9 @@ spec: managementPolicy: managed resource: properties: - diskBus: "scsi" - scsiModel: "virtio-scsi" + hardware: + diskBus: "scsi" + scsiModel: "virtio-scsi" content: diskFormat: qcow2 download: From 44e53b9afa3d8a5b2f76060bb8372b19f2451704 Mon Sep 17 00:00:00 2001 From: Kurt Garloff Date: Fri, 23 May 2025 09:24:19 +0200 Subject: [PATCH 2/3] Add a few more of the recommended SCS image metadata. Only as far as the upstream ORC schema supports it. Signed-off-by: Kurt Garloff --- .../openstack/scs/cluster-class/templates/image.yaml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/providers/openstack/scs/cluster-class/templates/image.yaml b/providers/openstack/scs/cluster-class/templates/image.yaml index 09f728c9..cba3bf79 100644 --- a/providers/openstack/scs/cluster-class/templates/image.yaml +++ b/providers/openstack/scs/cluster-class/templates/image.yaml @@ -12,7 +12,17 @@ spec: properties: hardware: diskBus: "scsi" - scsiModel: "virtio-scsi" + scsiModel: "virtio-scsi" + vifModel: virtio + qemuGuestAgent: true + rngModel: virtio + architecture: "x86_64" + minDiskGB: 20 + minMemoryMB: 2048 + operatingSystem: + distro: "ubuntu" + version: "22.04" + # hypervisorType: kvm content: diskFormat: qcow2 download: From 256742cc9ce5f05e4ce9c66b37e3598414c18f90 Mon Sep 17 00:00:00 2001 From: Kurt Garloff Date: Fri, 23 May 2025 09:40:10 +0200 Subject: [PATCH 3/3] Remove redundant quotes. In YAML, we typically only quote strings if they contain whitespace or could be confused with other data types. (More quoting does not hurt though.) Sidenote: I was mistaken by changing the capitalization of true. YAML-1.2.2 defines true/false as the canonical values. Signed-off-by: Kurt Garloff --- .../openstack/scs/cluster-class/templates/image.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/providers/openstack/scs/cluster-class/templates/image.yaml b/providers/openstack/scs/cluster-class/templates/image.yaml index cba3bf79..7ef11351 100644 --- a/providers/openstack/scs/cluster-class/templates/image.yaml +++ b/providers/openstack/scs/cluster-class/templates/image.yaml @@ -11,18 +11,18 @@ spec: resource: properties: hardware: - diskBus: "scsi" - scsiModel: "virtio-scsi" + diskBus: scsi + scsiModel: virtio-scsi vifModel: virtio qemuGuestAgent: true rngModel: virtio - architecture: "x86_64" + architecture: x86_64 minDiskGB: 20 minMemoryMB: 2048 operatingSystem: - distro: "ubuntu" + distro: ubuntu version: "22.04" - # hypervisorType: kvm + # hypervisorType: kvm # kvm not officially supported, could use qemu content: diskFormat: qcow2 download: