From 9eb8177eb7afa1e1cc9c64f80d175a1cb658ea50 Mon Sep 17 00:00:00 2001 From: Adam Gandelman Date: Fri, 21 Nov 2014 09:41:45 -0800 Subject: [PATCH] Move sgabios setup to hypervisor-ironic This moves setup of sgabios ROM to the ironic hypervisor library. This is failing to backport to juno because of an error in the sideways ironic grenade. install_ironic() is expected to setup only python things and happens earlier than initial package installation. Fixes-bug: #1396352 Change-Id: I75f0052045143571619e6712d57014228abf7a20 --- lib/ironic | 8 -------- lib/nova_plugins/hypervisor-ironic | 7 +++++++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/ironic b/lib/ironic index f2b1fb2f6a..fc4b162036 100644 --- a/lib/ironic +++ b/lib/ironic @@ -171,14 +171,6 @@ function install_ironic { if [[ "$IRONIC_IPXE_ENABLED" == "True" ]] ; then install_apache_wsgi fi - - if [[ "$IRONIC_VM_LOG_CONSOLE" == "True" ]] && is_ubuntu; then - # Ubuntu packaging+apparmor issue prevents libvirt from loading - # the ROM from /usr/share/misc. Workaround by installing it directly - # to a directory that it can read from. (LP: #1393548) - sudo rm -rf /usr/share/qemu/sgabios.bin - sudo cp /usr/share/misc/sgabios.bin /usr/share/qemu/sgabios.bin - fi } # install_ironicclient() - Collect sources and prepare diff --git a/lib/nova_plugins/hypervisor-ironic b/lib/nova_plugins/hypervisor-ironic index 420950328e..abf59b8008 100644 --- a/lib/nova_plugins/hypervisor-ironic +++ b/lib/nova_plugins/hypervisor-ironic @@ -56,6 +56,13 @@ function install_nova_hypervisor { die $LINENO "Neutron should be enabled for usage of the Ironic Nova driver." fi install_libvirt + if [[ "$IRONIC_VM_LOG_CONSOLE" == "True" ]] && is_ubuntu; then + # Ubuntu packaging+apparmor issue prevents libvirt from loading + # the ROM from /usr/share/misc. Workaround by installing it directly + # to a directory that it can read from. (LP: #1393548) + sudo rm -rf /usr/share/qemu/sgabios.bin + sudo cp /usr/share/misc/sgabios.bin /usr/share/qemu/sgabios.bin + fi } # start_nova_hypervisor - Start any required external services