wip

2 months ago · 825c9b8509
5 changed files with 12 additions and 8 deletions
--- a/bootc/baremetal/root/etc/systemd/system/bootstrap-vm@.service
+++ b/bootc/baremetal/root/etc/systemd/system/bootstrap-vm@.service
@ -10,13 +10,13 @@ ConditionPathExists=!/var/lib/libvirt/images/%i/root.qcow2
 # Only start if the VM definition file is present
 ConditionPathExists=/etc/default/bootstrap-vm-%i.env

-# Remain started to avoid race conditions
-Persistent=true
-
 [Service]
 Type=oneshot
 ExecStart=/usr/local/bin/bootstrap-vm.sh %i
 EnvironmentFile=/etc/default/bootstrap-vm-%i.env

+# Remain started to avoid race conditions
+RemainAfterExit=true
+
 [Install]
 WantedBy=multi-user.target
--- a/bootc/baremetal/root/etc/systemd/system/migrate-vm@.service
+++ b/bootc/baremetal/root/etc/systemd/system/migrate-vm@.service
@ -10,13 +10,13 @@ ConditionPathExists=!/var/lib/libvirt/images/%i/root.qcow2
 # Only start if the VM definition file is present
 ConditionPathExists=/etc/default/migrate-vm-%i.env

-# Remain started to avoid race conditions
-Persistent=true
-
 [Service]
 Type=oneshot
 ExecStart=/usr/local/bin/migrate-vm.sh %i
 EnvironmentFile=/etc/default/migrate-vm-%i.env

+# Remain started to avoid race conditions
+RemainAfterExit=true
+
 [Install]
 WantedBy=multi-user.target
--- a/bootc/base/root/etc/flightctl/hooks.d/afterupdating/99_greenboot.yaml
+++ b/bootc/base/root/etc/flightctl/hooks.d/afterupdating/99_greenboot.yaml
@ -0,0 +1,4 @@
+- if:
+  - path: /etc/greenboot/check/
+    op: [created, updated, removed]
+  run: systemctl restart greenboot-healthcheck.service
--- a/flightctl/fleets/baremetal/sites/paris-wagram/etc/default/bootstrap-vm-nextcloud.env
+++ b/flightctl/fleets/baremetal/sites/paris-wagram/etc/default/bootstrap-vm-nextcloud.env
@ -4,5 +4,5 @@ DOMAIN_DISK_SIZE=100
 DOMAIN_OS_VARIANT=rhel9.6
 DOMAIN_MAC_ADDRESS=04:00:00:00:00:01
 FLIGHTCTL_LABELS_OVERRIDE={ "type": "virtualmachine", "vm.name": "nextcloud" }
-DOMAIN_DISK_SOURCE=edge-registry.itix.fr/demo-edge-retail/virtualmachine:latest
+DOMAIN_DISK_SOURCE=edge-registry.itix.fr/demo-edge-retail/virtualmachine-qcow2:latest
 REGISTRY_AUTH_FILE=/etc/ostree/auth.json
--- a/flightctl/fleets/baremetal/sites/villeneuve-d-ascq/etc/default/bootstrap-vm-nextcloud.env
+++ b/flightctl/fleets/baremetal/sites/villeneuve-d-ascq/etc/default/bootstrap-vm-nextcloud.env
@ -4,5 +4,5 @@ DOMAIN_DISK_SIZE=100
 DOMAIN_OS_VARIANT=rhel9.6
 DOMAIN_MAC_ADDRESS=04:00:00:00:00:01
 FLIGHTCTL_LABELS_OVERRIDE={ "type": "virtualmachine", "vm.name": "nextcloud" }
-DOMAIN_DISK_SOURCE=edge-registry.itix.fr/demo-edge-retail/virtualmachine:latest
+DOMAIN_DISK_SOURCE=edge-registry.itix.fr/demo-edge-retail/virtualmachine-qcow2:latest
 REGISTRY_AUTH_FILE=/etc/ostree/auth.json