diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-17 11:10:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-17 11:10:29 +0000 |
| commit | 4fd2d2a91105269e3d79a8d7e724ab6758825f71 (patch) | |
| tree | 23ba00eebd2b3abcfe85442aefb0992cbbef5c19 /docker | |
| parent | f0defeafd295459c0532b8296c86543c31a95728 (diff) | |
| parent | 0ca49532692a19f4ada5feb99141afda27e16277 (diff) | |
| download | kolla-4fd2d2a91105269e3d79a8d7e724ab6758825f71.tar.gz kolla-4fd2d2a91105269e3d79a8d7e724ab6758825f71.zip | |
Merge "nova-libvirt: fix after centos 7 removal damage"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 953a0e43d..3b47de8b2 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -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 + [ |