openstack/devstack
Code Issues Proposed changes

Merge "Install libguestfs for nova-compute on Ubuntu"

Browse Source
This commit is contained in:
Jenkins 2014-01-31 23:36:30 +00:00 committed by Gerrit Code Review
commit e54dd252f6
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/apts/n-cpu
View File

@ -1,8 +1,8 @@
# Stuff for diablo volumes # Stuff for diablo volumes
nbd-client
lvm2 lvm2
open-iscsi open-iscsi
open-iscsi-utils # Deprecated since quantal dist:precise open-iscsi-utils # Deprecated since quantal dist:precise
genisoimage genisoimage
sysfsutils sysfsutils
sg3-utils sg3-utils
python-guestfs

6
lib/nova
View File

@ -240,8 +240,10 @@ function configure_nova() {
sudo sysctl -w net.ipv4.ip_forward=1 sudo sysctl -w net.ipv4.ip_forward=1
if [[ "$VIRT_DRIVER" = 'libvirt' ]]; then if [[ "$VIRT_DRIVER" = 'libvirt' ]]; then
# Attempt to load modules: network block device - used to manage qcow images # When libguestfs is available for file injection, enable using
sudo modprobe nbd || true # libguestfs to inspect the image and figure out the proper
# partition to inject into.
iniset $NOVA_CONF libvirt inject_partition '-1'
# Check for kvm (hardware based virtualization). If unable to initialize # Check for kvm (hardware based virtualization). If unable to initialize
# kvm, we drop back to the slower emulation mode (qemu). Note: many systems # kvm, we drop back to the slower emulation mode (qemu). Note: many systems