ceph-windows-PRs: Fix virt-install command

Behavior changed in newer virt-install.

`--import` says boot the prebuilt qcow2.  Older virt-install versions tolerated `--boot hd` without `--import` but now `--import` is required in this scenario and `--boot hd` is redundant.

Signed-off-by: David Galloway <david.galloway@ibm.com>

diff --git a/scripts/ceph-windows/setup_libvirt_ubuntu_vm b/scripts/ceph-windows/setup_libvirt_ubuntu_vm
index b2481ab8ce502e49593feb4bd5e5e8ddc0f7a2da..5e97b7225d1cb66f9f64c0219ca3b1eba52da6e6 100644 (file)
--- a/scripts/ceph-windows/setup_libvirt_ubuntu_vm
+++ b/scripts/ceph-windows/setup_libvirt_ubuntu_vm
@@ -53,7 +53,7 @@ cloud-localds ${LIBVIRT_DIR}/config-drive.img ${LIBVIRT_DIR}/user-data.yaml ${LI
 sudo virt-install \
     --name $UBUNTU_VM_NAME \
     --os-variant ubuntu22.04 \
-    --boot hd \
+    --import \
     --virt-type kvm \
     --graphics spice \
     --cpu host \

diff --git a/scripts/ceph-windows/setup_libvirt_windows_vm b/scripts/ceph-windows/setup_libvirt_windows_vm
index ade873d392c08135f504ad0afdd5109186dcca8b..6e64ab150e5c93ddb7517930ee9c20328f04293d 100644 (file)
--- a/scripts/ceph-windows/setup_libvirt_windows_vm
+++ b/scripts/ceph-windows/setup_libvirt_windows_vm
@@ -20,7 +20,7 @@ curl -s -L $WINDOWS_VM_IMAGE_URL -o ${LIBVIRT_DIR}/ceph-windows-client.qcow2
 sudo virt-install \
     --name $WINDOWS_VM_NAME \
     --os-variant win2k19 \
-    --boot hd \
+    --import \
     --virt-type kvm \
     --graphics spice \
     --cpu host \