Skip to content

Commit 88c1a77

Browse files
Jenkinsopenstack-gerrit
authored andcommitted
Merge "Add a way to enable file injection for nova/tempest"
2 parents be0f207 + 6d3670a commit 88c1a77

2 files changed

Lines changed: 9 additions & 0 deletions

File tree

lib/nova_plugins/hypervisor-libvirt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,14 @@ function configure_nova_hypervisor {
5858
iniset $NOVA_CONF libvirt cpu_mode "host-passthrough"
5959
fi
6060

61+
if isset ENABLE_FILE_INJECTION; then
62+
if [ "$ENABLE_FILE_INJECTION" == "True" ]; then
63+
# -1 means use libguestfs to inspect the guest OS image for the
64+
# root partition to use for file injection.
65+
iniset $NOVA_CONF libvirt inject_partition '-1'
66+
fi
67+
fi
68+
6169
if [[ "$LIBVIRT_TYPE" = "parallels" ]]; then
6270
iniset $NOVA_CONF libvirt connection_uri "parallels+unix:///system"
6371
iniset $NOVA_CONF libvirt images_type "ploop"

lib/tempest

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ function configure_tempest {
352352
iniset $TEMPEST_CONFIG compute max_microversion $tempest_compute_max_microversion
353353
fi
354354

355+
iniset $TEMPEST_CONFIG compute-feature-enabled personality ${ENABLE_FILE_INJECTION:-False}
355356
iniset $TEMPEST_CONFIG compute-feature-enabled resize True
356357
iniset $TEMPEST_CONFIG compute-feature-enabled live_migration ${LIVE_MIGRATION_AVAILABLE:-False}
357358
iniset $TEMPEST_CONFIG compute-feature-enabled change_password False

0 commit comments

Comments
 (0)