From c0e1ef520cead9038b345f28652801f75857c8a2 Mon Sep 17 00:00:00 2001 From: Jay Pipes Date: Mon, 30 Apr 2012 15:56:13 -0400 Subject: [PATCH] Add host/port/api_version to tempest.conf * Something exposed by LP #992096 was that the image tests were broken because the URL returned from the service catalog was no longer including a version identifier. The fix in Tempest was to pass the configure_via_auth=False parameter to the glance.client.Client constructor. However, in order for this to work, the host/port in the [image] section of the Tempest configuration file needs to be set Change-Id: I9f661a02270a1ad52c10f2233baf899e5f706c82 --- tools/configure_tempest.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/configure_tempest.sh b/tools/configure_tempest.sh index dd43313607..99c5012897 100755 --- a/tools/configure_tempest.sh +++ b/tools/configure_tempest.sh @@ -131,6 +131,11 @@ COMPUTE_LOG_LEVEL=ERROR BUILD_INTERVAL=10 BUILD_TIMEOUT=600 +# Image test configuration options... +IMAGE_HOST=${IMAGE_HOST:-127.0.0.1} +IMAGE_PORT=${IMAGE_PORT:-9292} +IMAGE_API_VERSION="1" + sed -e " s,%IDENTITY_USE_SSL%,$IDENTITY_USE_SSL,g; s,%IDENTITY_HOST%,$IDENTITY_HOST,g; @@ -154,6 +159,9 @@ sed -e " s,%IMAGE_ID_ALT%,$IMAGE_UUID_ALT,g; s,%FLAVOR_REF%,$FLAVOR_REF,g; s,%FLAVOR_REF_ALT%,$FLAVOR_REF_ALT,g; + s,%IMAGE_HOST%,$IMAGE_HOST,g; + s,%IMAGE_PORT%,$IMAGE_PORT,g; + s,%IMAGE_API_VERSION%,$IMAGE_API_VERSION,g; s,%ADMIN_USERNAME%,$ADMIN_USERNAME,g; s,%ADMIN_PASSWORD%,$ADMIN_PASSWORD,g; s,%ADMIN_TENANT_NAME%,$ADMIN_TENANT_NAME,g;