Merge "Fix tempest api testing"

This commit is contained in:
Jenkins 2015-03-09 23:31:40 +00:00 committed by Gerrit Code Review
commit 140ce6ce95
2 changed files with 7 additions and 2 deletions

View File

@ -97,9 +97,12 @@ class Manager(manager.Manager):
self.region_client = RegionClientJSON(self.auth_provider, **params)
self.credentials_client = CredentialsClientJSON(self.auth_provider,
**params)
self.token_client = TokenClientJSON()
# Token clients do not use the catalog. They only need default_params.
self.token_client = TokenClientJSON(CONF.identity.uri,
**self.default_params)
if CONF.identity_feature_enabled.api_v3:
self.token_v3_client = V3TokenClientJSON()
self.token_v3_client = V3TokenClientJSON(CONF.identity.uri_v3,
**self.default_params)
class AdminManager(Manager):

View File

@ -32,6 +32,8 @@ function copy_files {
'tempest/common/utils'
'tempest/services'
'tempest/services/identity'
'tempest/services/identity/v2'
'tempest/services/identity/v2/json'
'tempest/services/identity/v3'
'tempest/services/identity/v3/json'
'tempest/services/network'