openstack/devstack
Code Issues Proposed changes

Move file injection setting to the right place

Browse Source 
The nova code was wiping nova.conf after our iniset :(.

Change-Id: Ib618da1bd21da09f8855ec4691bff79c4c3b3d9c
This commit is contained in:
Robert Collins
2014-02-04 14:33:27 +13:00
parent 0af8122834
commit d70ba82b14
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/nova
View File

@@ -240,10 +240,6 @@ 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
# 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 # 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
# come with hardware virtualization disabled in BIOS. # come with hardware virtualization disabled in BIOS.
@@ -499,6 +495,12 @@ function create_nova_conf() {
iniset $NOVA_CONF DEFAULT ec2_dmz_host "$EC2_DMZ_HOST" iniset $NOVA_CONF DEFAULT ec2_dmz_host "$EC2_DMZ_HOST"
iniset_rpc_backend nova $NOVA_CONF DEFAULT iniset_rpc_backend nova $NOVA_CONF DEFAULT
iniset $NOVA_CONF DEFAULT glance_api_servers "$GLANCE_HOSTPORT" 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() { function init_nova_cells() {