diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-31 17:57:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-31 17:57:29 +0000 |
| commit | c1d1a65a5ba9d25abd02c52bb00d8b6b5c4797a0 (patch) | |
| tree | df6c49e10db40e68b27aea1094aa57a436e4e18c | |
| parent | f8c6762adeb171b6c4d8a670efc68c3575d0c2de (diff) | |
| parent | 15b68c15c1dd0c2df1cc49b550f2fa03a4c65e8e (diff) | |
| download | kolla-c1d1a65a5ba9d25abd02c52bb00d8b6b5c4797a0.tar.gz kolla-c1d1a65a5ba9d25abd02c52bb00d8b6b5c4797a0.zip | |
Merge "nova-libvirt: add UEFI packages to support UEFI instances"
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 30 | ||||
| -rw-r--r-- | releasenotes/notes/bug-1814552-a037354969dcf7e5.yaml | 6 |
2 files changed, 36 insertions, 0 deletions
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 293020d60..709d96534 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -37,6 +37,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 = [ @@ -60,6 +82,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 %} @@ -84,6 +107,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 diff --git a/releasenotes/notes/bug-1814552-a037354969dcf7e5.yaml b/releasenotes/notes/bug-1814552-a037354969dcf7e5.yaml new file mode 100644 index 000000000..207f6de5c --- /dev/null +++ b/releasenotes/notes/bug-1814552-a037354969dcf7e5.yaml @@ -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>` |