From e530ba30a6965c016934819be5b1cfcaa6879b75 Mon Sep 17 00:00:00 2001
From: Sean Dague <sean.dague@samsung.com>
Date: Fri, 7 Mar 2014 05:58:18 -0500
Subject: [PATCH] make compute-admin correct

we lost the admin tenant at some point in the last couple of
days which disabled 500 tempest tests. Bring this back.

Change-Id: I5cab2074777cab99982ae8fc4a83663e9d128284
---
 lib/tempest | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/tempest b/lib/tempest
index 8455aae170..b3736da963 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -293,9 +293,9 @@ function configure_tempest {
     iniset $TEMPEST_CONFIG compute ssh_connect_method $ssh_connect_method
 
     # Compute admin
-    iniset $TEMPEST_CONFIG "compute-admin" username $USERNAME
-    iniset $TEMPEST_CONFIG "compute-admin" password "$password" # DEPRECATED
-    iniset $TEMPEST_CONFIG "compute-admin" tenant_name $TENANT_NAME
+    iniset $TEMPEST_CONFIG "compute-admin" username $ADMIN_USERNAME
+    iniset $TEMPEST_CONFIG "compute-admin" password "$password"
+    iniset $TEMPEST_CONFIG "compute-admin" tenant_name $ADMIN_TENANT_NAME
 
     # Network
     iniset $TEMPEST_CONFIG network api_version 2.0