commit b93e22a9fc63ea81dc1ce689294d53c8eaa77fde
author Jenkins <jenkins@review.openstack.org> Fri Dec 27 12:12:57 2013 +0000
committer Gerrit Code Review <review@openstack.org> Fri Dec 27 12:12:57 2013 +0000
tree 5dfc22518461b60026398d6cd7bbda521ae5f252
parent f67a4517634c9c503474bae9652d6dcd3bdaccd9
parent ee1017c42be22ec9f7b98f5fbd69277ca6e91d2b

Merge "Fix AutoScalingTest test suite error"

tempest/scenario/manager.py

diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index d3d34d0..409fcc2 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -985,7 +985,7 @@
         username = cls.config.identity.admin_username
         password = cls.config.identity.admin_password
         tenant_name = cls.config.identity.tenant_name
-        return username, tenant_name, password
+        return username, password, tenant_name
 
     def _load_template(self, base_file, file_name):
         filepath = os.path.join(os.path.dirname(os.path.realpath(base_file)),