openstack
/
kolla
Code Issues Proposed changes

nova-libvirt: add UEFI packages to support UEFI instances 

Fix inability to run UEFI-based images/instances by installing UEFI
packages also in nova-libvirt image which is not based on nova-base.

Includes support for C8.
Backport below Train w/o C8.

Closes-Bug: #1814552
Co-authored-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Co-authored-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
Change-Id: I1d5cd3d9af98444acac5bedd7daeaa6c6673dcd6
(cherry picked from commit 15b68c15c1)
This commit is contained in:
chenxing 2019-09-16 14:46:41 +08:00 committed by Radosław Piliszek
parent 9b8dbab77f
commit ffaf585d0f
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
docker/nova/nova-libvirt/Dockerfile.j2
View File

@ -31,6 +31,28 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %}
{% endif %}
{% if base_arch == 'x86_64' %}
{% if base_distro_tag.startswith('7') %}
{% set nova_libvirt_packages = nova_libvirt_packages + [
'OVMF'
] %}
{% else %}
{% set nova_libvirt_packages = nova_libvirt_packages + [
'edk2-ovmf'
] %}
{% endif %}
{% elif base_arch == 'aarch64' %}
{% if base_distro_tag.startswith('7') %}
{% set nova_libvirt_packages = nova_libvirt_packages + [
'AAVMF'
] %}
{% else %}
{% set nova_libvirt_packages = nova_libvirt_packages + [
'edk2-aarch64'
] %}
{% endif %}
{% endif %}
{% elif base_package_type == 'deb' %}
{% set nova_libvirt_packages = [
@ -54,6 +76,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %}
{% elif base_arch == "x86_64" %}
{% set nova_libvirt_packages = nova_libvirt_packages + [
'ovmf',
'qemu-kvm'
] %}
{% endif %}
@ -78,6 +101,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
RUN rm -f /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/autostart/default.xml
{% elif base_package_type == 'rpm' %}
{% if base_arch == 'x86_64' and base_distro_tag.startswith('7') %}
# NOTE(jeffrey4l): for x86_64, nova will validate the existence of /usr/share/OVMF/OVMF_CODE.fd
RUN ln -sf /usr/share/OVMF/OVMF_CODE.secboot.fd /usr/share/OVMF/OVMF_CODE.fd
{% endif %}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start

6
releasenotes/notes/bug-1814552-a037354969dcf7e5.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fix inability to run UEFI-based images/instances by installing UEFI packages
also in nova-libvirt image which is not based on nova-base.
`LP#1814552 <https://launchpad.net/bugs/1814552>`