From a3c94468baa159840a47c34cf94d97d816208313 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 23 Jun 2015 12:23:29 +0200 Subject: [PATCH] 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 --- lib/nova_plugins/hypervisor-libvirt | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/lib/nova_plugins/hypervisor-libvirt b/lib/nova_plugins/hypervisor-libvirt index f70b21a475..f52629dc91 100644 --- a/lib/nova_plugins/hypervisor-libvirt +++ b/lib/nova_plugins/hypervisor-libvirt @@ -25,9 +25,6 @@ source $TOP_DIR/lib/nova_plugins/functions-libvirt # 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 @@ function configure_nova_hypervisor { 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 @@ function install_nova_hypervisor { 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