openstack/devstack
Code Issues Proposed changes

Merge "Disable file injection for libvirt driver"

Browse Source
This commit is contained in:
Jenkins 2014-02-03 23:42:18 +00:00 committed by Gerrit Code Review
commit b7bdb68b62
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/nova
View File

@ -240,10 +240,9 @@ 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
# When libguestfs is available for file injection, enable using # File injection is being disabled by default in the near future -
# libguestfs to inspect the image and figure out the proper # disable it here for now to avoid surprises later.
# partition to inject into. iniset $NOVA_CONF libvirt inject_partition '-2'
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