summaryrefslogtreecommitdiff
path: root/troveclient/client.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-10-25 19:52:20 +0000
committerGerrit Code Review <review@openstack.org>2013-10-25 19:52:20 +0000
commit00507ae54fcb17a442fcaf6908d333ef05578879 (patch)
treee22f0b262f183974adff837c638599131f7d543e /troveclient/client.py
parent24443e177efa445c9dd9004d7896126531e1b238 (diff)
parente9c5eddc516594962b18cbe2f5e6e683067bd6f3 (diff)
downloadpython-troveclient-1.0.3.tar.gz
Merge "Add --bypass-url option to trove client"1.0.3
Diffstat (limited to 'troveclient/client.py')
-rw-r--r--troveclient/client.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/troveclient/client.py b/troveclient/client.py
index af9362e..19bc1ef 100644
--- a/troveclient/client.py
+++ b/troveclient/client.py
@@ -63,7 +63,7 @@ class HTTPClient(object):
proxy_token=None, region_name=None,
endpoint_type='publicURL', service_type=None,
service_name=None, database_service_name=None, retries=None,
- http_log_debug=False, cacert=None):
+ http_log_debug=False, cacert=None, bypass_url=None):
self.user = user
self.password = password
self.projectid = projectid
@@ -83,6 +83,7 @@ class HTTPClient(object):
self.proxy_token = proxy_token
self.proxy_tenant_id = proxy_tenant_id
self.timeout = timeout
+ self.bypass_url = bypass_url
if insecure:
self.verify_cert = False
@@ -325,6 +326,10 @@ class HTTPClient(object):
auth_url = auth_url + '/v2.0'
self._v2_auth(auth_url)
+ # Allows for setting an endpoint not defined in the catalog
+ if self.bypass_url is not None and self.bypass_url != '':
+ self.management_url = self.bypass_url
+
def _v1_auth(self, url):
if self.proxy_token:
raise exceptions.NoTokenLookupException()