From daca490226d0a0048d3d215b2a184f10108082e5 Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Fri, 3 Jul 2020 16:13:21 +0200 Subject: [PATCH] Follow up of fix uefi jobs with ovmf native ubuntu package Following up on comments from https://review.opendev.org/716889 Change-Id: I805a65478f469b1b4e25c1bf2397f034f61d6ec7 --- bindep.txt | 2 +- devstack/files/debs/ironic | 3 --- zuul.d/ironic-jobs.yaml | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/bindep.txt b/bindep.txt index 80df57a523..36b4ce35d4 100644 --- a/bindep.txt +++ b/bindep.txt @@ -35,7 +35,7 @@ qemu [platform:dpkg devstack build-image-dib] qemu-kvm [platform:dpkg devstack] qemu-utils [platform:dpkg devstack build-image-dib] qemu-system-data [platform:dpkg devstack] -sgabios [platform: rpm devstack] +sgabios [platform:rpm devstack] ipxe-qemu [platform:dpkg devstack] edk2-ovmf [platform:rpm devstack] ovmf [platform:dpkg devstack] diff --git a/devstack/files/debs/ironic b/devstack/files/debs/ironic index 375f34439f..49b0689d71 100644 --- a/devstack/files/debs/ironic +++ b/devstack/files/debs/ironic @@ -20,9 +20,6 @@ jq libguestfs-tools libguestfs0 libvirt-bin # dist:bionic -libvirt-daemon-driver-storage-gluster # dist:focal -libvirt-daemon-driver-lxc # dist:focal -libvirt-daemon-driver-storage-rbd # dist:focal libvirt-daemon-system # dist:focal libvirt-dev open-iscsi diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index fda847d03c..3cdbd9f84a 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -321,7 +321,7 @@ vars: devstack_localrc: IRONIC_BOOT_MODE: uefi - IRONIC_VM_SPECS_RAM: 3096 + IRONIC_VM_SPECS_RAM: 4096 IRONIC_AUTOMATED_CLEAN_ENABLED: False IRONIC_DEFAULT_BOOT_OPTION: netboot @@ -645,7 +645,6 @@ IRONIC_BOOT_MODE: uefi IRONIC_AUTOMATED_CLEAN_ENABLED: False IRONIC_DEFAULT_BOOT_OPTION: netboot - IRONIC_VM_SPECS_DISK: 10 IRONIC_VM_SPECS_RAM: 4096 - job: