From 090a265669940c98b84e610bbbdd10c29c3d3d02 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 9 May 2016 04:59:13 -0500 Subject: [PATCH] Workaround bad required params in troveclient 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 --- os_client_config/cloud_config.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/os_client_config/cloud_config.py b/os_client_config/cloud_config.py index 5dfbba9..08c739a 100644 --- a/os_client_config/cloud_config.py +++ b/os_client_config/cloud_config.py @@ -351,6 +351,13 @@ class CloudConfig(object): constructor_kwargs['api_version'] = version else: 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)