@@ -167,6 +167,10 @@ COMPUTE_CHANGE_PASSWORD_AVAILABLE=False  # not supported with QEMU...

 COMPUTE_LOG_LEVEL=ERROR

 BUILD_INTERVAL=3

 BUILD_TIMEOUT=400

+COMPUTE_BUILD_INTERVAL=3

+COMPUTE_BUILD_TIMEOUT=400

+VOLUME_BUILD_INTERVAL=3

+VOLUME_BUILD_TIMEOUT=300

 RUN_SSH=True

 # Check for DEFAULT_INSTANCE_USER and try to connect with that account

 SSH_USER=${DEFAULT_INSTANCE_USER:-$OS_USERNAME}

@@ -219,6 +223,8 @@ sed -e "

     s,%COMPUTE_LOG_LEVEL%,$COMPUTE_LOG_LEVEL,g;

     s,%BUILD_INTERVAL%,$BUILD_INTERVAL,g;

     s,%BUILD_TIMEOUT%,$BUILD_TIMEOUT,g;

+    s,%COMPUTE_BUILD_INTERVAL%,$COMPUTE_BUILD_INTERVAL,g;

+    s,%COMPUTE_BUILD_TIMEOUT%,$COMPUTE_BUILD_TIMEOUT,g;

     s,%RUN_SSH%,$RUN_SSH,g;

     s,%SSH_USER%,$SSH_USER,g;

     s,%NETWORK_FOR_SSH%,$NETWORK_FOR_SSH,g;

@@ -246,6 +252,8 @@ sed -e "

     s,%NETWORK_CATALOG_TYPE%,$NETWORK_CATALOG_TYPE,g;

     s,%NETWORK_API_VERSION%,$NETWORK_API_VERSION,g;

     s,%VOLUME_CATALOG_TYPE%,$VOLUME_CATALOG_TYPE,g;

+    s,%VOLUME_BUILD_INTERVAL%,$VOLUME_BUILD_INTERVAL,g;

+    s,%VOLUME_BUILD_TIMEOUT%,$VOLUME_BUILD_TIMEOUT,g;

 " -i $TEMPEST_CONF

 echo "Created tempest configuration file:"