Browse code

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

Jenkins authored on 2016/08/09 20:43:39
Showing 2 changed files
... ...
@@ -58,6 +58,14 @@ function configure_nova_hypervisor {
58 58
         iniset $NOVA_CONF libvirt cpu_mode "host-passthrough"
59 59
     fi
60 60
 
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
+
61 69
     if [[ "$LIBVIRT_TYPE" = "parallels" ]]; then
62 70
         iniset $NOVA_CONF libvirt connection_uri "parallels+unix:///system"
63 71
         iniset $NOVA_CONF libvirt images_type "ploop"
... ...
@@ -352,6 +352,7 @@ function configure_tempest {
352 352
         iniset $TEMPEST_CONFIG compute max_microversion $tempest_compute_max_microversion
353 353
     fi
354 354
 
355
+    iniset $TEMPEST_CONFIG compute-feature-enabled personality ${ENABLE_FILE_INJECTION:-False}
355 356
     iniset $TEMPEST_CONFIG compute-feature-enabled resize True
356 357
     iniset $TEMPEST_CONFIG compute-feature-enabled live_migration ${LIVE_MIGRATION_AVAILABLE:-False}
357 358
     iniset $TEMPEST_CONFIG compute-feature-enabled change_password False