Merge "Fix bug 1020474 by correcting substitutions in configure_tempest.sh"

This commit is contained in:
Jenkins 2012-07-03 18:47:54 +00:00 committed by Gerrit Code Review
commit 67ec4065fb

View File

@ -162,9 +162,13 @@ sed -e "
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;
s,%COMPUTE_ADMIN_USERNAME%,$ADMIN_USERNAME,g;
s,%COMPUTE_ADMIN_PASSWORD%,$ADMIN_PASSWORD,g;
s,%COMPUTE_ADMIN_TENANT_NAME%,$ADMIN_TENANT_NAME,g;
s,%IDENTITY_ADMIN_USERNAME%,$ADMIN_USERNAME,g;
s,%IDENTITY_ADMIN_PASSWORD%,$ADMIN_PASSWORD,g;
s,%IDENTITY_ADMIN_TENANT_NAME%,$ADMIN_TENANT_NAME,g;
s,%COMPUTE_ALLOW_TENANT_ISOLATION%,true,g;
" -i $TEMPEST_CONF
echo "Created tempest configuration file:"