commit 70edafc9d396db3f47de24d4b5224268396360f0
author John Garbutt <john.garbutt@citrix.com> Tue Jul 03 10:24:08 2012 +0100
committer John Garbutt <john.garbutt@citrix.com> Tue Jul 03 10:39:32 2012 +0100
tree c4fb64b0fd969c7b706784bac365a74a29c020a6
parent 5a70e3f5501a157b62528ea44a7da1df0fc4009e

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

diff --git a/tools/configure_tempest.sh b/tools/configure_tempest.sh
index 2c06934..7a72045 100755
--- a/tools/configure_tempest.sh
+++ b/tools/configure_tempest.sh
@@ -162,9 +162,13 @@
     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:"