@@ -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