openstack/devstack
Code Issues Proposed changes

Remove support for enabling file injection

Browse Source 
File injection is disabled in nova meanwhile, and devstack core
reviewers think it shouldn't be configureable in devstack anymore.
This basically reverts https://review.openstack.org/#/c/70560/

Change-Id: Ia7dd407da00c0b1c9641865aea1f7b74533d7357
This commit is contained in:
Dirk Mueller 2015-06-23 12:23:29 +02:00
parent d523a71514
commit a3c94468ba
1 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/nova_plugins/hypervisor-libvirt
View File

@ -25,9 +25,6 @@ source $TOP_DIR/lib/nova_plugins/functions-libvirt
# Defaults # Defaults
# -------- # --------
# File injection is disabled by default in Nova. This will turn it back on.
ENABLE_FILE_INJECTION=$(trueorfalse False ENABLE_FILE_INJECTION)
# Entry Points # Entry Points
# ------------ # ------------
@ -60,17 +57,9 @@ function configure_nova_hypervisor {
iniset $NOVA_CONF DEFAULT vnc_enabled "false" iniset $NOVA_CONF DEFAULT vnc_enabled "false"
fi fi
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 - # File injection is being disabled by default in the near future -
# disable it here for now to avoid surprises later. # disable it here for now to avoid surprises later.
iniset $NOVA_CONF libvirt inject_partition '-2' iniset $NOVA_CONF libvirt inject_partition '-2'
fi
if [[ "$LIBVIRT_TYPE" = "parallels" ]]; then if [[ "$LIBVIRT_TYPE" = "parallels" ]]; then
iniset $NOVA_CONF libvirt connection_uri "parallels+unix:///system" iniset $NOVA_CONF libvirt connection_uri "parallels+unix:///system"
@ -96,14 +85,6 @@ function install_nova_hypervisor {
yum_install libcgroup-tools yum_install libcgroup-tools
fi fi
fi fi
if [[ "$ENABLE_FILE_INJECTION" = "True" ]] ; then
if is_ubuntu; then
install_package python-guestfs
elif is_fedora || is_suse; then
install_package python-libguestfs
fi
fi
} }
# start_nova_hypervisor - Start any required external services # start_nova_hypervisor - Start any required external services