diff options
| author | Zuul <zuul@review.opendev.org> | 2023-03-02 03:19:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-03-02 03:19:25 +0000 |
| commit | 28f7dfa33bd3b73b3bf238ed81a48886b795a928 (patch) | |
| tree | 2c3fe0cb1c876cb22d16e6ba6345fb3d63f1b6c2 | |
| parent | 92ae4d2fd2909cf79d6d1e4971a40a63412431a7 (diff) | |
| parent | 30a269ceeefde605bbc8f9b68b65f99f30af9184 (diff) | |
| download | tempest-28f7dfa33bd3b73b3bf238ed81a48886b795a928.tar.gz | |
Merge "Cinder client fails if identity API version specified"
| -rw-r--r-- | tempest/lib/cli/base.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tempest/lib/cli/base.py b/tempest/lib/cli/base.py index c661d21cd..c9cffd235 100644 --- a/tempest/lib/cli/base.py +++ b/tempest/lib/cli/base.py @@ -97,6 +97,10 @@ class CLIClient(object): :type identity_api_version: string """ + CLIENTS_WITHOUT_IDENTITY_VERSION = ['nova', 'nova_manage', 'keystone', + 'glance', 'ceilometer', 'heat', + 'cinder', 'neutron', 'sahara'] + def __init__(self, username='', password='', tenant_name='', uri='', cli_dir='', insecure=False, prefix='', user_domain_name=None, user_domain_id=None, project_domain_name=None, @@ -377,8 +381,9 @@ class CLIClient(object): self.password, self.uri)) if self.identity_api_version: - creds += ' --os-identity-api-version %s' % ( - self.identity_api_version) + if cmd not in self.CLIENTS_WITHOUT_IDENTITY_VERSION: + creds += ' --os-identity-api-version %s' % ( + self.identity_api_version) if self.user_domain_name is not None: creds += ' --os-user-domain-name %s' % self.user_domain_name if self.user_domain_id is not None: |