From 361fd585032b14a918b306b8a56c03bc3095cbc4 Mon Sep 17 00:00:00 2001 From: Chris Wheeler Date: Mon, 17 Jun 2024 09:59:59 -0700 Subject: [PATCH] Parameterize qemu-kvm emulator path for portability across Linux distros. Issue-ID: INF-441 Change-Id: I7da6fd4fff3464605145acdf9c1114ef2242bcfe Signed-off-by: Chris Wheeler --- okd/roles/ocloud_infra_vm/tasks/main.yml | 13 +++++++++++++ okd/roles/ocloud_infra_vm/templates/virt.xml.j2 | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/okd/roles/ocloud_infra_vm/tasks/main.yml b/okd/roles/ocloud_infra_vm/tasks/main.yml index 320e4df..0594ecb 100644 --- a/okd/roles/ocloud_infra_vm/tasks/main.yml +++ b/okd/roles/ocloud_infra_vm/tasks/main.yml @@ -21,6 +21,19 @@ run_once: true become: true +- name: Locate qemu-kvm emulator + stat: + path: "{{ item }}" + register: ocloud_infra_vm_emulator_stat + loop: + - /usr/bin/qemu-kvm + - /usr/libexec/qemu-kvm + +- set_fact: + ocloud_infra_vm_emulator_path: "{{ item.stat.path }}" + when: item.stat.exists + loop: "{{ ocloud_infra_vm_emulator_stat.results }}" + - name: Create virtual machine - {{ inventory_hostname }} community.libvirt.virt: command: define diff --git a/okd/roles/ocloud_infra_vm/templates/virt.xml.j2 b/okd/roles/ocloud_infra_vm/templates/virt.xml.j2 index 3f6565e..283faf7 100644 --- a/okd/roles/ocloud_infra_vm/templates/virt.xml.j2 +++ b/okd/roles/ocloud_infra_vm/templates/virt.xml.j2 @@ -25,7 +25,7 @@ - /usr/libexec/qemu-kvm + {{ ocloud_infra_vm_emulator_path }} -- 2.16.6