Merge "Add host/port/api_version to tempest.conf"

This commit is contained in:
Jenkins 2012-04-30 23:03:08 +00:00 committed by Gerrit Code Review
commit e716416c2e

View File

@ -131,6 +131,11 @@ COMPUTE_LOG_LEVEL=ERROR
BUILD_INTERVAL=10 BUILD_INTERVAL=10
BUILD_TIMEOUT=600 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 " sed -e "
s,%IDENTITY_USE_SSL%,$IDENTITY_USE_SSL,g; s,%IDENTITY_USE_SSL%,$IDENTITY_USE_SSL,g;
s,%IDENTITY_HOST%,$IDENTITY_HOST,g; s,%IDENTITY_HOST%,$IDENTITY_HOST,g;
@ -154,6 +159,9 @@ sed -e "
s,%IMAGE_ID_ALT%,$IMAGE_UUID_ALT,g; s,%IMAGE_ID_ALT%,$IMAGE_UUID_ALT,g;
s,%FLAVOR_REF%,$FLAVOR_REF,g; s,%FLAVOR_REF%,$FLAVOR_REF,g;
s,%FLAVOR_REF_ALT%,$FLAVOR_REF_ALT,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_USERNAME%,$ADMIN_USERNAME,g;
s,%ADMIN_PASSWORD%,$ADMIN_PASSWORD,g; s,%ADMIN_PASSWORD%,$ADMIN_PASSWORD,g;
s,%ADMIN_TENANT_NAME%,$ADMIN_TENANT_NAME,g; s,%ADMIN_TENANT_NAME%,$ADMIN_TENANT_NAME,g;