From a04963a6abdf34a49ecb815d97de394d8c7a152b Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Thu, 30 Jan 2020 16:26:08 +0100
Subject: [PATCH] nova: use proper uefi package names under CentOS/RHEL 8

Change-Id: I92be17ef1ce0f81ab3f49433a0d1e688874ba64e
---
 docker/nova/nova-base/Dockerfile.j2 | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2
index da379662cf..b3ec434b18 100644
--- a/docker/nova/nova-base/Dockerfile.j2
+++ b/docker/nova/nova-base/Dockerfile.j2
@@ -20,12 +20,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
                 {% set nova_base_packages = nova_base_packages + [
                     'OVMF'
                 ] %}
+            {% else %}
+                {% set nova_base_packages = nova_base_packages + [
+                    'edk2-ovmf'
+                ] %}
             {% endif %}
         {% elif base_arch == 'aarch64' %}
             {% if base_distro_tag.startswith('7') %}
                 {% set nova_base_packages = nova_base_packages + [
                     'AAVMF'
                 ] %}
+            {% else %}
+                {% set nova_base_packages = nova_base_packages + [
+                    'edk2-aarch64'
+                ] %}
             {% endif %}
         {% elif base_arch == '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 + [
                     'OVMF'
                 ] %}
+            {% else %}
+                {% set nova_base_packages = nova_base_packages + [
+                    'edk2-ovmf'
+                ] %}
             {% endif %}
         {% elif base_arch == 'aarch64' %}
             {% if base_distro_tag.startswith('7') %}
                 {% set nova_base_packages = nova_base_packages + [
                     'AAVMF'
                 ] %}
+            {% else %}
+                {% set nova_base_packages = nova_base_packages + [
+                    'edk2-aarch64'
+                ] %}
             {% endif %}
         {% elif base_arch == 'ppc64le' %}
             {# NOTE(Jeffrey4l): no packages for ppc64le #}