diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-05-07 16:32:37 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-05-21 09:47:11 +0200 |
| commit | ca7aa99e33f9d37aa8a654d4f4534fc9d824c3d9 (patch) | |
| tree | c8e2af6ee256fdcddabe0a006ce864f44151458c | |
| parent | 93ecf4204e5a7717432e300daebc35e25c16d3c4 (diff) | |
Switch to project domain name
At least Fuel, Apex and Joid don't export OS_PROJECT_DOMAIN_ID.
https://build.opnfv.org/ci/view/functest/job/functest-joid-baremetal-daily-master/353/console
Change-Id: I8441d2de1841d5a9ce78c6929fd78da01c45548c
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 084dd47cdeb68f150165e009877ed995cb9db6dc)
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index 285dc44f0..ff2b297d7 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -368,7 +368,9 @@ class TempestResourcesManager(object): self.guid = '-' + str(uuid.uuid4()) self.cloud = shade.OperatorCloud( cloud_config=os_client_config.get_config()) - self.domain_id = self.cloud.auth["project_domain_id"] + LOGGER.debug("cloud: %s", self.cloud) + self.domain = self.cloud.auth.get("project_domain_name", "Default") + LOGGER.debug("domain: %s", self.domain) self.project = None self.user = None self.network = None @@ -384,7 +386,7 @@ class TempestResourcesManager(object): getattr(config.CONF, 'tempest_identity_tenant_name') + self.guid, description=getattr( config.CONF, 'tempest_identity_tenant_description'), - domain_id=self.domain_id) + domain_id=self.domain) LOGGER.debug("project: %s", self.project) def _create_user(self): @@ -395,7 +397,7 @@ class TempestResourcesManager(object): password=getattr(config.CONF, 'tempest_identity_user_password'), default_project=getattr( config.CONF, 'tempest_identity_tenant_name') + self.guid, - domain_id=self.domain_id) + domain_id=self.domain) LOGGER.debug("user: %s", self.user) def _create_network(self): |