openstack/python-zunclient
Code Issues Proposed changes

Merge "Fix the os_identity_api_version parameter"

Browse Source
This commit is contained in:
Jenkins 2017-04-23 02:18:44 +00:00 committed by Gerrit Code Review
commit fa61ba016e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zunclient/tests/functional/base.py
View File

@ -75,7 +75,8 @@ class FunctionalTestBase(base.ClientTestBase):
keystone_v3_conf_settings = []
if auth_strategy == 'keystone':
conf_settings += ['os_auth_url', 'os_username',
'os_password', 'os_project_name']
'os_password', 'os_project_name',
'os_identity_api_version']
keystone_v3_conf_settings += ['os_user_domain_id',
'os_project_domain_id']
else:
@ -147,8 +148,7 @@ class FunctionalTestBase(base.ClientTestBase):
def _zun_osc(self, action, flags='', params=''):
"""Execute container commands via OpenStack Client."""
config = self._get_config()
identity_api_version = config.get('functional',
'os_identity_api_version')
identity_api_version = config.get('os_identity_api_version')
flags += ' --os-identity-api-version {0}'.format(identity_api_version)
for keystone_object in 'user', 'project':