openstack
/
kolla
Code Issues Proposed changes

nova: Only install OVMF on EL 7 when installing from source 

This use case was missed in Ic8f865ed9cfc89056991ce4fa50a99c4937af33b.

Change-Id: Ibe4c459d60f1143c76657588ed9c0081bda92239
This commit is contained in:
Lee Yarwood 2019-02-21 11:52:21 +00:00
parent 34db656e57
commit cbcd2efe71
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docker/nova/nova-base/Dockerfile.j2
View File

@ -65,13 +65,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openvswitch'
] %}
{% if base_arch == 'x86_64' %}
{% set nova_base_packages = nova_base_packages + [
'OVMF'
] %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] and base_distro_tag.startswith('7') %}
{% set nova_base_packages = nova_base_packages + [
'OVMF'
] %}
{% endif %}
{% elif base_arch == 'aarch64' %}
{% set nova_base_packages = nova_base_packages + [
'AAVMF'
] %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] and base_distro_tag.startswith('7') %}
{% set nova_base_packages = nova_base_packages + [
'AAVMF'
] %}
{% endif %}
{% elif base_arch == 'ppc64le' %}
{# NOTE(Jeffrey4l): no packages for ppc64le #}
{% endif %}