openstack/devstack
Code Issues Proposed changes

Optionally enable file injection

Browse Source 
There is a patch up for nova right now that disables file injection by default.
This is a corresponding devstack change that only sets file injection options if
it is enabled in the devstack config.  This is good to keep around so that we
can easily turn it on for testing.

The nova change is id Icff1304fc816acc843f8962727aef8bbbc7bbaa3.

Change-Id: I5015f2c351b1d680c205d7f9a5204febca490b91
This commit is contained in:
Russell Bryant 2014-02-01 20:06:42 -05:00
parent 305bad7887
commit 5705db6913
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/nova
View File

@ -513,12 +513,6 @@ function create_nova_conf() {
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() {

16
lib/nova_plugins/hypervisor-libvirt
View File

@ -23,6 +23,9 @@ set +o xtrace
# Defaults
# --------
# File injection is disabled by default in Nova. This will turn it back on.
ENABLE_FILE_INJECTION=${ENABLE_FILE_INJECTION:-False}
# Entry Points
# ------------
@ -116,6 +119,19 @@ EOF"
if is_arch "ppc64"; then
iniset $NOVA_CONF DEFAULT vnc_enabled "false"
fi
ENABLE_FILE_INJECTION=$(trueorfalse False $ENABLE_FILE_INJECTION)
if [[ "$ENABLE_FILE_INJECTION" = "True" ]] ; then
# When libguestfs is available for file injection, enable using
# libguestfs to inspect the image and figure out the proper
# partition to inject into.
iniset $NOVA_CONF libvirt inject_partition '-1'
iniset $NOVA_CONF libvirt inject_key 'true'
else
# 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
}
# install_nova_hypervisor() - Install external components