Browse code

Merge "Fix devstack default settings in aarch64"

Zuul authored on 2020/06/04 19:13:00
Showing 2 changed files
... ...
@@ -59,6 +59,9 @@ function install_libvirt {
59 59
 
60 60
     if is_ubuntu; then
61 61
         install_package qemu-system libvirt-clients libvirt-daemon-system libvirt-dev
62
+        if is_arch "aarch64"; then
63
+            install_package qemu-efi
64
+        fi
62 65
         # uninstall in case the libvirt version changed
63 66
         pip_uninstall libvirt-python
64 67
         pip_install_gr libvirt-python
... ...
@@ -78,6 +81,10 @@ function install_libvirt {
78 78
         install_package qemu-kvm
79 79
 
80 80
         install_package libvirt libvirt-devel
81
+        if is_arch "aarch64"; then
82
+            install_package edk2.git-aarch64
83
+        fi
84
+
81 85
         pip_uninstall libvirt-python
82 86
         pip_install_gr libvirt-python
83 87
     fi
... ...
@@ -52,8 +52,6 @@ function configure_nova_hypervisor {
52 52
 
53 53
     # arm64-specific configuration
54 54
     if is_arch "aarch64"; then
55
-        # arm64 architecture currently does not support graphical consoles.
56
-        iniset $NOVA_CONF vnc enabled "false"
57 55
         iniset $NOVA_CONF libvirt cpu_mode "host-passthrough"
58 56
     fi
59 57