commit 781201919268afc135cb7cca8c57d795b64017c9
author Jenkins <jenkins@review.openstack.org> Thu Mar 12 02:12:28 2015 +0000
committer Gerrit Code Review <review@openstack.org> Thu Mar 12 02:12:28 2015 +0000
tree d34a9cbf1f035fd16534d225df9d97a41301d33d
parent d9954da9d835a3e3902f8b2ef0707a27ff96864f
parent 1049e4e3e8443720d8c3d752d3572c0c1f22a70a

Merge "Fix: don't hardcode admin role name, use config option instead"

tempest/api/identity/admin/v3/test_default_project_id.py

diff --git a/tempest/api/identity/admin/v3/test_default_project_id.py b/tempest/api/identity/admin/v3/test_default_project_id.py
index f1cc530..5555ee8 100644
--- a/tempest/api/identity/admin/v3/test_default_project_id.py
+++ b/tempest/api/identity/admin/v3/test_default_project_id.py
@@ -66,7 +66,7 @@
                          "doesn't have domain id " + dom_id)
 
         # get roles and find the admin role
-        admin_role = self.get_role_by_name("admin")
+        admin_role = self.get_role_by_name(CONF.identity.admin_role)
         admin_role_id = admin_role['id']
 
         # grant the admin role to the user on his project