openstack/kolla
Code Issues Proposed changes

Merge "nova: use proper uefi package names under CentOS/RHEL 8"

Browse Source
This commit is contained in:
Zuul 2020-02-04 15:26:24 +00:00 committed by Gerrit Code Review
commit 49445b68f8
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,12 +20,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set nova_base_packages = nova_base_packages + [ {% set nova_base_packages = nova_base_packages + [
'OVMF' 'OVMF'
] %} ] %}
{% else %}
{% set nova_base_packages = nova_base_packages + [
'edk2-ovmf'
] %}
{% endif %} {% endif %}
{% elif base_arch == 'aarch64' %} {% elif base_arch == 'aarch64' %}
{% if base_distro_tag.startswith('7') %} {% if base_distro_tag.startswith('7') %}
{% set nova_base_packages = nova_base_packages + [ {% set nova_base_packages = nova_base_packages + [
'AAVMF' 'AAVMF'
] %} ] %}
{% else %}
{% set nova_base_packages = nova_base_packages + [
'edk2-aarch64'
] %}
{% endif %} {% endif %}
{% elif base_arch == 'ppc64le' %} {% elif base_arch == 'ppc64le' %}
{# NOTE(Jeffrey4l): no packages for ppc64le #} {# NOTE(Jeffrey4l): no packages for ppc64le #}
@ -65,12 +73,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set nova_base_packages = nova_base_packages + [ {% set nova_base_packages = nova_base_packages + [
'OVMF' 'OVMF'
] %} ] %}
{% else %}
{% set nova_base_packages = nova_base_packages + [
'edk2-ovmf'
] %}
{% endif %} {% endif %}
{% elif base_arch == 'aarch64' %} {% elif base_arch == 'aarch64' %}
{% if base_distro_tag.startswith('7') %} {% if base_distro_tag.startswith('7') %}
{% set nova_base_packages = nova_base_packages + [ {% set nova_base_packages = nova_base_packages + [
'AAVMF' 'AAVMF'
] %} ] %}
{% else %}
{% set nova_base_packages = nova_base_packages + [
'edk2-aarch64'
] %}
{% endif %} {% endif %}
{% elif base_arch == 'ppc64le' %} {% elif base_arch == 'ppc64le' %}
{# NOTE(Jeffrey4l): no packages for ppc64le #} {# NOTE(Jeffrey4l): no packages for ppc64le #}