diff options
| author | Zane Bitter <zbitter@redhat.com> | 2014-09-26 13:57:26 -0400 |
|---|---|---|
| committer | Zane Bitter <zbitter@redhat.com> | 2014-09-26 13:57:26 -0400 |
| commit | 8d4b3ef9ac7ff5d52ae9a81d22ba1d1c07b6e749 (patch) | |
| tree | ebaef86bce511de75052f31cb017f5ef3ecb0c1f | |
| parent | 9fdbf468248e0755ac6414a68a47e3a79bdf5cc2 (diff) | |
| download | heat-8d4b3ef9ac7ff5d52ae9a81d22ba1d1c07b6e749.tar.gz | |
Handle clients that don't accept auth_url=None
Some clients fail when passed None as the auth_url. Pass them an empty
string instead when the auth_url is None.
Change-Id: Ie7cf788a00660efae578b6444ee231876025ebba
Closes-Bug: #1332991
Closes-Bug: #1334492
| -rw-r--r-- | heat/engine/clients/os/cinder.py | 2 | ||||
| -rw-r--r-- | heat/engine/clients/os/trove.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/heat/engine/clients/os/cinder.py b/heat/engine/clients/os/cinder.py index 26880243e..f8badca3d 100644 --- a/heat/engine/clients/os/cinder.py +++ b/heat/engine/clients/os/cinder.py @@ -27,7 +27,7 @@ class CinderClientPlugin(client_plugin.ClientPlugin): endpoint_type = self._get_client_option('cinder', 'endpoint_type') args = { 'service_type': 'volume', - 'auth_url': con.auth_url, + 'auth_url': con.auth_url or '', 'project_id': con.tenant, 'username': None, 'api_key': None, diff --git a/heat/engine/clients/os/trove.py b/heat/engine/clients/os/trove.py index 7ee1fdd86..a3882c655 100644 --- a/heat/engine/clients/os/trove.py +++ b/heat/engine/clients/os/trove.py @@ -28,7 +28,7 @@ class TroveClientPlugin(client_plugin.ClientPlugin): endpoint_type = self._get_client_option('trove', 'endpoint_type') args = { 'service_type': 'database', - 'auth_url': con.auth_url, + 'auth_url': con.auth_url or '', 'proxy_token': con.auth_token, 'username': None, 'password': None, |