From 5ed5af6d5067176cf37aed4c13623260371b839d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A2u=20Cao?= <raucao@kosmos.org>
Date: Sun, 12 Apr 2026 08:53:50 +0400
Subject: [PATCH 1/2] Use hardware clock sync on Ubuntu 24.04+ VMs

---
 site-cookbooks/kosmos-base/recipes/default.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site-cookbooks/kosmos-base/recipes/default.rb b/site-cookbooks/kosmos-base/recipes/default.rb
index 4d32ae6..666a0d1 100644
--- a/site-cookbooks/kosmos-base/recipes/default.rb
+++ b/site-cookbooks/kosmos-base/recipes/default.rb
@@ -26,9 +26,9 @@
 
 include_recipe 'apt'
 include_recipe 'timezone_iii'
-include_recipe 'ntp'
 include_recipe 'kosmos-base::journald_conf'
 include_recipe 'kosmos-base::systemd_emails'
+include_recipe "ntp" if node["platform"] == "ubuntu" && node["platform_version"].to_f < 24.04
 
 node.override["apt"]["unattended_upgrades"]["enable"] = true
 node.override["apt"]["unattended_upgrades"]["mail_only_on_error"] = false
-- 
2.50.1


From 22d459b558f4d9bb2f2515e3dc1466da96921841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A2u=20Cao?= <raucao@kosmos.org>
Date: Sun, 12 Apr 2026 08:54:47 +0400
Subject: [PATCH 2/2] Create new VMs with Ubuntu 24.04

---
 site-cookbooks/kosmos_kvm/attributes/default.rb   | 8 ++++----
 site-cookbooks/kosmos_kvm/templates/create_vm.erb | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/site-cookbooks/kosmos_kvm/attributes/default.rb b/site-cookbooks/kosmos_kvm/attributes/default.rb
index 8251551..2983cf6 100644
--- a/site-cookbooks/kosmos_kvm/attributes/default.rb
+++ b/site-cookbooks/kosmos_kvm/attributes/default.rb
@@ -1,9 +1,9 @@
-release = "20260320"
-img_filename = "ubuntu-22.04-server-cloudimg-amd64-disk-kvm"
+release = "20260321"
+img_filename = "ubuntu-24.04-server-cloudimg-amd64"
 
 node.default["kosmos_kvm"]["host"]["qemu_base_image"] = {
-  "url" => "https://cloud-images.ubuntu.com/releases/jammy/release-#{release}/#{img_filename}.img",
-  "checksum" => "f7173eb7137b4f0ebeaea8fffe68ecdab1e3c787bde1fd8dfdf27103554332b3",
+  "url" => "https://cloud-images.ubuntu.com/releases/noble/release-#{release}/#{img_filename}.img",
+  "checksum" => "5c3ddb00f60bc455dac0862fabe9d8bacec46c33ac1751143c5c3683404b110d",
   "path" => "/var/lib/libvirt/images/base/#{img_filename}-#{release}.qcow2"
 }
 
diff --git a/site-cookbooks/kosmos_kvm/templates/create_vm.erb b/site-cookbooks/kosmos_kvm/templates/create_vm.erb
index 2060359..b94b79b 100644
--- a/site-cookbooks/kosmos_kvm/templates/create_vm.erb
+++ b/site-cookbooks/kosmos_kvm/templates/create_vm.erb
@@ -70,7 +70,7 @@ virt-install \
   --vcpus "$CPUS" \
   --cpu host \
   --arch x86_64 \
-  --osinfo detect=on,name=ubuntujammy \
+  --osinfo detect=on,name=ubuntu24.04 \
   --hvm \
   --virt-type kvm \
   --disk "$IMAGE_PATH" \
-- 
2.50.1