Browse code
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
Adam Gandelman authored on 2014/11/22 02:41:45Showing 2 changed files
| ... | ... |
@@ -171,14 +171,6 @@ function install_ironic {
|
| 171 | 171 |
if [[ "$IRONIC_IPXE_ENABLED" == "True" ]] ; then |
| 172 | 172 |
install_apache_wsgi |
| 173 | 173 |
fi |
| 174 |
- |
|
| 175 |
- if [[ "$IRONIC_VM_LOG_CONSOLE" == "True" ]] && is_ubuntu; then |
|
| 176 |
- # Ubuntu packaging+apparmor issue prevents libvirt from loading |
|
| 177 |
- # the ROM from /usr/share/misc. Workaround by installing it directly |
|
| 178 |
- # to a directory that it can read from. (LP: #1393548) |
|
| 179 |
- sudo rm -rf /usr/share/qemu/sgabios.bin |
|
| 180 |
- sudo cp /usr/share/misc/sgabios.bin /usr/share/qemu/sgabios.bin |
|
| 181 |
- fi |
|
| 182 | 174 |
} |
| 183 | 175 |
|
| 184 | 176 |
# install_ironicclient() - Collect sources and prepare |
| ... | ... |
@@ -56,6 +56,13 @@ function install_nova_hypervisor {
|
| 56 | 56 |
die $LINENO "Neutron should be enabled for usage of the Ironic Nova driver." |
| 57 | 57 |
fi |
| 58 | 58 |
install_libvirt |
| 59 |
+ if [[ "$IRONIC_VM_LOG_CONSOLE" == "True" ]] && is_ubuntu; then |
|
| 60 |
+ # Ubuntu packaging+apparmor issue prevents libvirt from loading |
|
| 61 |
+ # the ROM from /usr/share/misc. Workaround by installing it directly |
|
| 62 |
+ # to a directory that it can read from. (LP: #1393548) |
|
| 63 |
+ sudo rm -rf /usr/share/qemu/sgabios.bin |
|
| 64 |
+ sudo cp /usr/share/misc/sgabios.bin /usr/share/qemu/sgabios.bin |
|
| 65 |
+ fi |
|
| 59 | 66 |
} |
| 60 | 67 |
|
| 61 | 68 |
# start_nova_hypervisor - Start any required external services |