Move file injection setting to the right place
The nova code was wiping nova.conf after our iniset :(.
Change-Id: Ib618da1bd21da09f8855ec4691bff79c4c3b3d9c
diff --git a/lib/nova b/lib/nova
index 0db242a..dbc5c3d 100644
--- a/lib/nova
+++ b/lib/nova
@@ -240,10 +240,6 @@
sudo sysctl -w net.ipv4.ip_forward=1
if [[ "$VIRT_DRIVER" = 'libvirt' ]]; then
- # File injection is being disabled by default in the near future -
- # disable it here for now to avoid surprises later.
- iniset $NOVA_CONF libvirt inject_partition '-2'
-
# Check for kvm (hardware based virtualization). If unable to initialize
# kvm, we drop back to the slower emulation mode (qemu). Note: many systems
# come with hardware virtualization disabled in BIOS.
@@ -499,6 +495,12 @@
iniset $NOVA_CONF DEFAULT ec2_dmz_host "$EC2_DMZ_HOST"
iniset_rpc_backend nova $NOVA_CONF DEFAULT
iniset $NOVA_CONF DEFAULT glance_api_servers "$GLANCE_HOSTPORT"
+
+ if [[ "$VIRT_DRIVER" = 'libvirt' ]]; then
+ # File injection is being disabled by default in the near future -
+ # disable it here for now to avoid surprises later.
+ iniset $NOVA_CONF libvirt inject_partition '-2'
+ fi
}
function init_nova_cells() {