diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-09-29 10:57:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-09-29 10:57:09 +0000 |
| commit | 8be4e9041c5b9c5936656ae037c6d696a90f0f53 (patch) | |
| tree | 9b818eb5e975ed615d659bbbd04f6617df2bc8b6 | |
| parent | fe43d4f3b61f60baea4aa03ec763a3c0d329e040 (diff) | |
| parent | 8d4b3ef9ac7ff5d52ae9a81d22ba1d1c07b6e749 (diff) | |
| download | heat-8be4e9041c5b9c5936656ae037c6d696a90f0f53.tar.gz | |
Merge "Handle clients that don't accept auth_url=None"
| -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, |