From 70edafc9d396db3f47de24d4b5224268396360f0 Mon Sep 17 00:00:00 2001 From: John Garbutt Date: Tue, 3 Jul 2012 10:24:08 +0100 Subject: [PATCH] Fix bug 1020474 by correcting substitutions in configure_tempest.sh This is caused by the following commit in tempest: f38eaace9cb39d98b1203bd4c86b33d20501b7a3 Change-Id: I0cf6b49e81b696411a0c01f66c2b89508dc701b9 --- tools/configure_tempest.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/configure_tempest.sh b/tools/configure_tempest.sh index 2c069343b2..7a720455c8 100755 --- a/tools/configure_tempest.sh +++ b/tools/configure_tempest.sh @@ -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:"