x/deb-os-client-config
Code Issues Proposed changes

Workaround bad required params in troveclient

Browse Source 
troveclient requires username and password as parameters to the Client
object, but if a Session is passed (like we do) that's not needed. A
patch has been submitted to troveclient, but until that has been
released, simply send None to both parameters.

Change-Id: Ie130a4e83cceb7cab69bfbeb559493d195ef35e1
This commit is contained in:
Monty Taylor 2016-05-09 04:59:13 -05:00
parent 16ed02735b
commit 090a265669
No known key found for this signature in database
GPG Key ID: 3390DB68041A12F0
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
os_client_config/cloud_config.py
View File

@ -351,6 +351,13 @@ class CloudConfig(object):
constructor_kwargs['api_version'] = version constructor_kwargs['api_version'] = version
else: else:
constructor_kwargs['version'] = version constructor_kwargs['version'] = version
if service_key == 'database':
# TODO(mordred) Remove when https://review.openstack.org/314032
# has landed and released. We're passing in a Session, but the
# trove Client object has username and password as required
# args
constructor_kwargs['username'] = None
constructor_kwargs['password'] = None
return client_class(**constructor_kwargs) return client_class(**constructor_kwargs)