Remove support for enabling file injection
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
diff --git a/lib/nova_plugins/hypervisor-libvirt b/lib/nova_plugins/hypervisor-libvirt
index f70b21a..f52629d 100644
--- a/lib/nova_plugins/hypervisor-libvirt
+++ b/lib/nova_plugins/hypervisor-libvirt
@@ -25,9 +25,6 @@
# 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
# ------------
@@ -60,17 +57,9 @@
iniset $NOVA_CONF DEFAULT vnc_enabled "false"
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 -
- # disable it here for now to avoid surprises later.
- iniset $NOVA_CONF libvirt inject_partition '-2'
- fi
+ # 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'
if [[ "$LIBVIRT_TYPE" = "parallels" ]]; then
iniset $NOVA_CONF libvirt connection_uri "parallels+unix:///system"
@@ -96,14 +85,6 @@
yum_install libcgroup-tools
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