openstack/trove
Code Issues Proposed changes

Merge "Corrects service URLs from "%s/%s/" to "%s/%s""

Browse Source
This commit is contained in:
Jenkins
2014-02-11 02:50:03 +00:00
committed by Gerrit Code Review
parent 10b2b2b288 afa8a3b692
commit e8bd3e6330
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
trove/common/remote.py
View File

@@ -46,7 +46,7 @@ def nova_client(context):
client = Client(context.user, context.auth_token,
project_id=context.tenant, auth_url=PROXY_AUTH_URL)
client.client.auth_token = context.auth_token
client.client.management_url = "%s/%s/" % (COMPUTE_URL, context.tenant)
client.client.management_url = "%s/%s" % (COMPUTE_URL, context.tenant)
return client
@@ -66,12 +66,12 @@ def cinder_client(context):
project_id=context.tenant,
auth_url=PROXY_AUTH_URL)
client.client.auth_token = context.auth_token
client.client.management_url = "%s/%s/" % (VOLUME_URL, context.tenant)
client.client.management_url = "%s/%s" % (VOLUME_URL, context.tenant)
return client
def heat_client(context):
endpoint = "%s/%s/" % (HEAT_URL, context.tenant)
endpoint = "%s/%s" % (HEAT_URL, context.tenant)
client = HeatClient.Client(token=context.auth_token,
os_no_client_auth=True,
endpoint=endpoint)