Browse code

Merge "New TEMPEST_VOLUME_REVERT_TO_SNAPSHOT setting"

Zuul authored on 2020/05/16 08:32:01
Showing 1 changed files
... ...
@@ -472,6 +472,11 @@ function configure_tempest {
472 472
         TEMPEST_EXTEND_ATTACHED_VOLUME=${TEMPEST_EXTEND_ATTACHED_VOLUME:-True}
473 473
     fi
474 474
     iniset $TEMPEST_CONFIG volume-feature-enabled extend_attached_volume $(trueorfalse False TEMPEST_EXTEND_ATTACHED_VOLUME)
475
+    # Only turn on TEMPEST_VOLUME_REVERT_TO_SNAPSHOT by default for "lvm" backends
476
+    if [[ "$CINDER_ENABLED_BACKENDS" == *"lvm"* ]]; then
477
+        TEMPEST_VOLUME_REVERT_TO_SNAPSHOT=${TEMPEST_VOLUME_REVERT_TO_SNAPSHOT:-True}
478
+    fi
479
+    iniset $TEMPEST_CONFIG volume-feature-enabled volume_revert $(trueorfalse False TEMPEST_VOLUME_REVERT_TO_SNAPSHOT)
475 480
     local tempest_volume_min_microversion=${TEMPEST_VOLUME_MIN_MICROVERSION:-None}
476 481
     local tempest_volume_max_microversion=${TEMPEST_VOLUME_MAX_MICROVERSION:-"latest"}
477 482
     # Reset microversions to None where v2 is running which does not support microversion.