From 551848dd696b32a48946b6f0a22079d57907a27c Mon Sep 17 00:00:00 2001 From: Kevin Zhao Date: Mon, 27 Apr 2020 08:39:37 +0800 Subject: [PATCH] Fix devstack default settings in aarch64 1. Lack qemu-efi in ubuntu 2. Lack edk2.git-aarch64 in Fedora/Centos 3. Remove NOVNC disable. Change-Id: Ifbd0c386df6b28bc64cef20cab8e08f99a85c782 Signed-off-by: Kevin Zhao --- lib/nova_plugins/functions-libvirt | 7 +++++++ lib/nova_plugins/hypervisor-libvirt | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/nova_plugins/functions-libvirt b/lib/nova_plugins/functions-libvirt index 03df258e03..d3827c30dd 100644 --- a/lib/nova_plugins/functions-libvirt +++ b/lib/nova_plugins/functions-libvirt @@ -59,6 +59,9 @@ function install_libvirt { if is_ubuntu; then install_package qemu-system libvirt-clients libvirt-daemon-system libvirt-dev + if is_arch "aarch64"; then + install_package qemu-efi + fi # uninstall in case the libvirt version changed pip_uninstall libvirt-python pip_install_gr libvirt-python @@ -78,6 +81,10 @@ function install_libvirt { install_package qemu-kvm install_package libvirt libvirt-devel + if is_arch "aarch64"; then + install_package edk2.git-aarch64 + fi + pip_uninstall libvirt-python pip_install_gr libvirt-python fi diff --git a/lib/nova_plugins/hypervisor-libvirt b/lib/nova_plugins/hypervisor-libvirt index b0ae29e39b..b25bc0c367 100644 --- a/lib/nova_plugins/hypervisor-libvirt +++ b/lib/nova_plugins/hypervisor-libvirt @@ -52,8 +52,6 @@ function configure_nova_hypervisor { # arm64-specific configuration if is_arch "aarch64"; then - # arm64 architecture currently does not support graphical consoles. - iniset $NOVA_CONF vnc enabled "false" iniset $NOVA_CONF libvirt cpu_mode "host-passthrough" fi