@@ -386,6 +386,14 @@ function create_cinder_accounts {

             "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v2/\$(project_id)s" \

             "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v2/\$(project_id)s" \

             "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v2/\$(project_id)s"

+

+        get_or_create_service "cinderv3" "volumev3" "Cinder Volume Service V3"

+        get_or_create_endpoint \

+            "volumev3" \

+            "$REGION_NAME" \

+            "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v3/\$(project_id)s" \

+            "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v3/\$(project_id)s" \

+            "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v3/\$(project_id)s"

     fi

 }

@@ -425,6 +425,8 @@ function configure_tempest {

     iniset $TEMPEST_CONFIG volume-feature-enabled incremental_backup_force True

     # TODO(ynesenenko): Remove the volume_services flag when Liberty and Kilo will correct work with host info.

     iniset $TEMPEST_CONFIG volume-feature-enabled volume_services True

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

+    iniset $TEMPEST_CONFIG volume-feature-enabled api_v3 True

     if ! is_service_enabled c-bak; then

         iniset $TEMPEST_CONFIG volume-feature-enabled backup False