Merge "Add a way to enable file injection for nova/tempest"
diff --git a/lib/nova_plugins/hypervisor-libvirt b/lib/nova_plugins/hypervisor-libvirt
index b6126ec..20dde8e 100644
--- a/lib/nova_plugins/hypervisor-libvirt
+++ b/lib/nova_plugins/hypervisor-libvirt
@@ -58,6 +58,14 @@
iniset $NOVA_CONF libvirt cpu_mode "host-passthrough"
fi
+ if isset ENABLE_FILE_INJECTION; then
+ if [ "$ENABLE_FILE_INJECTION" == "True" ]; then
+ # -1 means use libguestfs to inspect the guest OS image for the
+ # root partition to use for file injection.
+ iniset $NOVA_CONF libvirt inject_partition '-1'
+ fi
+ fi
+
if [[ "$LIBVIRT_TYPE" = "parallels" ]]; then
iniset $NOVA_CONF libvirt connection_uri "parallels+unix:///system"
iniset $NOVA_CONF libvirt images_type "ploop"
diff --git a/lib/tempest b/lib/tempest
index e4f80b8..d1e56a4 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -352,6 +352,7 @@
iniset $TEMPEST_CONFIG compute max_microversion $tempest_compute_max_microversion
fi
+ iniset $TEMPEST_CONFIG compute-feature-enabled personality ${ENABLE_FILE_INJECTION:-False}
iniset $TEMPEST_CONFIG compute-feature-enabled resize True
iniset $TEMPEST_CONFIG compute-feature-enabled live_migration ${LIVE_MIGRATION_AVAILABLE:-False}
iniset $TEMPEST_CONFIG compute-feature-enabled change_password False