@@ -437,7 +437,11 @@ function configure_tempest {

         TEMPEST_VOLUME_MANAGE_SNAPSHOT=${TEMPEST_VOLUME_MANAGE_SNAPSHOT:-True}

     fi

     iniset $TEMPEST_CONFIG volume-feature-enabled manage_snapshot $(trueorfalse False TEMPEST_VOLUME_MANAGE_SNAPSHOT)

-

+    # Only turn on TEMPEST_VOLUME_MANAGE_VOLUME by default for "lvm" backends

+    if [[ "$CINDER_ENABLED_BACKENDS" == *"lvm"* ]]; then

+        TEMPEST_VOLUME_MANAGE_VOLUME=${TEMPEST_VOLUME_MANAGE_VOLUME:-True}

+    fi

+    iniset $TEMPEST_CONFIG volume-feature-enabled manage_volume $(trueorfalse False TEMPEST_VOLUME_MANAGE_VOLUME)

     # TODO(ameade): Remove the api_v3 flag when Mitaka and Liberty are end of life.

     iniset $TEMPEST_CONFIG volume-feature-enabled api_v3 True

     iniset $TEMPEST_CONFIG volume-feature-enabled api_v1 $(trueorfalse False TEMPEST_VOLUME_API_V1)