openstack
/
python-designateclient
Code Issues Proposed changes

Merge "Always allow overriding the endpoint"

This commit is contained in:
Jenkins 2013-05-25 12:00:50 +00:00 committed by Gerrit Code Review
parent d038db8a50 02835b0856
commit e8f7306112
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
monikerclient/v1/__init__.py
View File

@ -41,7 +41,10 @@ class Client(object):
auth = KeystoneAuth(auth_url, username, password, tenant_id,
tenant_name, token, service_type,
endpoint_type, sudo_tenant_id)
self.endpoint = auth.get_url()
if endpoint:
self.endpoint = endpoint
else:
self.endpoint = auth.get_url()
elif endpoint:
auth = None
self.endpoint = endpoint