openstack
/
heat
Code Issues Proposed changes

Merge "Handle clients that don't accept auth_url=None"

This commit is contained in:
Jenkins 2014-09-29 10:57:09 +00:00 committed by Gerrit Code Review
parent fe43d4f3b6 8d4b3ef9ac
commit 8be4e9041c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/engine/clients/os/cinder.py
View File

@ -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,

2
heat/engine/clients/os/trove.py
View File

@ -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,