From 1e575b49ea58d447eb4940e3341e1d99e63efdf5 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Mon, 29 Mar 2021 10:46:57 +0100 Subject: [PATCH] Revert "Revert Bump sushy-tools and allow to ignore boot device" This reverts #609 and restores #606 Fix added for issue mentioned in: https://github.com/metal3-io/metal3-dev-env/pull/606/files#r595873052 This will also be tested by CI since: https://github.com/metal3-io/project-infra/pull/175 This reverts commit 505dcf0f643299ea329a08f82fb4885bdbf3bb67. --- resources/sushy-tools/Dockerfile | 2 +- vm-setup/roles/virtbmc/defaults/main.yml | 1 + vm-setup/roles/virtbmc/tasks/setup_tasks.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/sushy-tools/Dockerfile b/resources/sushy-tools/Dockerfile index 2fde5c097..c0c4a51e6 100644 --- a/resources/sushy-tools/Dockerfile +++ b/resources/sushy-tools/Dockerfile @@ -2,6 +2,6 @@ FROM registry.hub.docker.com/library/python:3.9 RUN apt update && \ apt install -y libvirt-dev && \ - pip3 install sushy-tools==0.14.0 libvirt-python + pip3 install sushy-tools==0.15.0 libvirt-python CMD sushy-emulator -i :: -p 8000 --config /root/sushy/conf.py diff --git a/vm-setup/roles/virtbmc/defaults/main.yml b/vm-setup/roles/virtbmc/defaults/main.yml index 75ce16845..ed76101c3 100644 --- a/vm-setup/roles/virtbmc/defaults/main.yml +++ b/vm-setup/roles/virtbmc/defaults/main.yml @@ -1,2 +1,3 @@ # Can be set to "teardown" to destroy a previous configuration virtbmc_action: setup +sushy_ignore_boot_device: False diff --git a/vm-setup/roles/virtbmc/tasks/setup_tasks.yml b/vm-setup/roles/virtbmc/tasks/setup_tasks.yml index 6656aec55..8ddd8ffe8 100644 --- a/vm-setup/roles/virtbmc/tasks/setup_tasks.yml +++ b/vm-setup/roles/virtbmc/tasks/setup_tasks.yml @@ -96,4 +96,5 @@ dest: "{{ working_dir }}/virtualbmc/sushy-tools/conf.py" content: | SUSHY_EMULATOR_LIBVIRT_URI = "{{ vbmc_libvirt_uri }}" + SUSHY_EMULATOR_IGNORE_BOOT_DEVICE = {{ sushy_ignore_boot_device }} become: true