commit e9337e422c9eeb9244cbe4899bb9ea86b010bfef
author Jenkins <jenkins@review.openstack.org> Mon Apr 30 23:24:59 2012 +0000
committer Gerrit Code Review <review@openstack.org> Mon Apr 30 23:24:59 2012 +0000
tree 1a203c53379eb5725c5be4e9c302be4fb7b91327
parent e716416c2ea286bba5d9cea607275281ba43650f
parent 2fb5bce5b0e6037ff8dbe5b7b0d53288715e803a

Merge "libxml2-dev package is needed for lxml.etree"

tools/configure_tempest.sh

diff --git a/tools/configure_tempest.sh b/tools/configure_tempest.sh
index dd43313..bed3d67 100755
--- a/tools/configure_tempest.sh
+++ b/tools/configure_tempest.sh
@@ -119,9 +119,9 @@
 FLAVOR_REF=1
 FLAVOR_REF_ALT=2
 
-ADMIN_USERNAME={$ADMIN_USERNAME:-admin}
-ADMIN_PASSWORD={$ADMIN_PASSWORD:-secrete}
-ADMIN_TENANT_NAME={$ADMIN_TENANT:-admin}
+ADMIN_USERNAME=${ADMIN_USERNAME:-admin}
+ADMIN_PASSWORD=${ADMIN_PASSWORD:-secrete}
+ADMIN_TENANT_NAME=${ADMIN_TENANT:-admin}
 
 # Do any of the following need to be configurable?
 COMPUTE_CATALOG_TYPE=compute
@@ -131,6 +131,11 @@
 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 @@
     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;