openstack
/
kolla
Code Issues Proposed changes

Merge "nova-libvirt: fix after centos 7 removal damage"

This commit is contained in:
Zuul 2020-04-17 11:10:29 +00:00 committed by Gerrit Code Review
parent f0defeafd2 0ca4953269
commit 4fd2d2a911
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,17 +63,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'qemu-system',
'trousers'
] %}
{% 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 %}
{% if base_arch == "aarch64" %}
{% set nova_libvirt_packages = nova_libvirt_packages + [
'qemu-efi'
'qemu-efi-aarch64'
] %}
{% elif base_arch == "x86_64" %}
{% set nova_libvirt_packages = nova_libvirt_packages + [