@@ -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() {

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