openstack/devstack
Code Issues Proposed changes

Merge "Move sgabios setup to hypervisor-ironic"

Browse Source
This commit is contained in:
Jenkins 2014-11-26 15:41:54 +00:00 committed by Gerrit Code Review
commit ca7aa301b2
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
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

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."
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