diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-03-09 23:30:47 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-03-09 23:30:47 +0000 |
commit | 776d6914028c9d3e737642ff5b0b7cdbcef774bd (patch) | |
tree | c890c6ea12c0ab153c44e15cbb049a96e2815258 | |
parent | 88a516dc62e1f5d2280351dcb9abdb18fa5ec953 (diff) | |
parent | 9f1466372ef0838aa2871ebc11e9b801dd72982d (diff) | |
download | python-troveclient-776d6914028c9d3e737642ff5b0b7cdbcef774bd.tar.gz |
Merge "Fixed issues while using --bypass-url"
-rw-r--r-- | troveclient/client.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/troveclient/client.py b/troveclient/client.py index daa0173..e5164bd 100644 --- a/troveclient/client.py +++ b/troveclient/client.py @@ -79,7 +79,7 @@ class HTTPClient(TroveClientMixin): http_log_debug=False, cacert=None, bypass_url=None, auth_system='keystone', auth_plugin=None): - if auth_system != 'keystone' and not auth_plugin: + if auth_system and auth_system != 'keystone' and not auth_plugin: raise exceptions.AuthSystemNotFound(auth_system) if not auth_url and auth_system and auth_system != 'keystone': @@ -92,14 +92,6 @@ class HTTPClient(TroveClientMixin): self.projectid = projectid self.tenant_id = tenant_id - if auth_system and auth_system != 'keystone' and not auth_plugin: - raise exceptions.AuthSystemNotFound(auth_system) - - if not auth_url and auth_system and auth_system != 'keystone': - auth_url = auth_plugin.get_auth_url() - if not auth_url: - raise exceptions.EndpointNotFound() - self.auth_url = auth_url.rstrip('/') if auth_url else auth_url self.version = 'v1' self.region_name = region_name |