commit 37728045bc34a61d6d1b3801500d571cb0c9e5aa
author Jenkins <jenkins@review.openstack.org> Wed Oct 01 23:46:40 2014 +0000
committer Gerrit Code Review <review@openstack.org> Wed Oct 01 23:46:40 2014 +0000
tree d9ef3a06d09b5f8f58ee16509c3a5b376d2f3460
parent 2cae75a6539b33a66e57a6b28dc606c695e01acf
parent 436de86458fbd74e7b409b2b5fc760989c4b414c

Merge "javelin: fix user destruction"

tempest/cmd/javelin.py

diff --git a/tempest/cmd/javelin.py b/tempest/cmd/javelin.py
index 27e388d..3c41dd9 100755
--- a/tempest/cmd/javelin.py
+++ b/tempest/cmd/javelin.py
@@ -184,7 +184,9 @@
 def destroy_users(users):
     admin = keystone_admin()
     for user in users:
-        user_id = admin.identity.get_user_by_name(user['name'])['id']
+        tenant_id = admin.identity.get_tenant_by_name(user['tenant'])['id']
+        user_id = admin.identity.get_user_by_username(tenant_id,
+                                                      user['name'])['id']
         r, body = admin.identity.delete_user(user_id)