diff options
author | 2018-09-22 21:35:04 +0200 | |
---|---|---|
committer | 2018-09-22 22:13:22 +0200 | |
commit | 35764b15ffc508398a70547e7db5cb1680ab6eb1 (patch) | |
tree | bce8db77268e198a5a4c606e64a320634a3c25dc /functest/opnfv_tests/openstack/tempest/tempest.py | |
parent | 47e21b230cdc31bd2b5d5f8213485ed7665ab681 (diff) |
Set admin_domain_scope to True (tempest)
It completes the previous commit [1].
It also sets cidr and fully forces Keystone v3.
[1] https://gerrit.opnfv.org/gerrit/#/c/62777/
Change-Id: Ida948a4ff051dc1d1325d29a815c201366a1e33e
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit f4b545efe2339bdb5f6117d484e127adda5c8021)
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest/tempest.py')
-rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index a4fff4756..e9ab53c90 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -46,17 +46,17 @@ class TempestCommon(singlevm.VmReady2): assert self.cloud assert self.project if self.orig_cloud.get_role("admin"): - role_name = "admin" + self.role_name = "admin" elif self.orig_cloud.get_role("Admin"): - role_name = "Admin" + self.role_name = "Admin" else: raise Exception("Cannot detect neither admin nor Admin") self.orig_cloud.grant_role( - role_name, user=self.project.user.id, + self.role_name, user=self.project.user.id, project=self.project.project.id, domain=self.project.domain.id) self.orig_cloud.grant_role( - role_name, user=self.project.user.id, + self.role_name, user=self.project.user.id, domain=self.project.domain.id) environ = dict( os.environ, @@ -409,7 +409,7 @@ class TempestCommon(singlevm.VmReady2): compute_cnt=compute_cnt, image_alt_id=self.image_alt.id, flavor_alt_id=self.flavor_alt.id, - domain_name=self.cloud.auth.get("project_domain_name", "Default")) + admin_role_name=self.role_name, cidr=self.cidr) self.update_scenario_section() self.backup_tempest_config(self.conf_file, self.res_dir) |