openstack/devstack
Code Issues Proposed changes

Move sgabios setup to hypervisor-ironic

Browse Source 
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
This commit is contained in:
Adam Gandelman 2014-11-21 09:41:45 -08:00 committed by Ian Wienand
parent 74a8ccf3b4
commit 9eb8177eb7
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ironic
View File

@ -171,14 +171,6 @@ function install_ironic {
if [[ "$IRONIC_IPXE_ENABLED" == "True" ]] ; then if [[ "$IRONIC_IPXE_ENABLED" == "True" ]] ; then
install_apache_wsgi install_apache_wsgi
fi 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 # install_ironicclient() - Collect sources and prepare

7
lib/nova_plugins/hypervisor-ironic
View File

@ -56,6 +56,13 @@ function install_nova_hypervisor {
die $LINENO "Neutron should be enabled for usage of the Ironic Nova driver." die $LINENO "Neutron should be enabled for usage of the Ironic Nova driver."
fi fi
install_libvirt 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 # start_nova_hypervisor - Start any required external services