Merge "Add a way to enable file injection for nova/tempest"

This commit is contained in:
Jenkins 2016-08-09 11:43:39 +00:00 committed by Gerrit Code Review
commit 88c1a7715d
2 changed files with 9 additions and 0 deletions

View File

@ -58,6 +58,14 @@ function configure_nova_hypervisor {
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"

View File

@ -352,6 +352,7 @@ function configure_tempest {
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