x/tuskar-ui
Code Issues Proposed changes

Use publicURLs for generated endpoints for ec2rc.sh

Browse Source 
Fixes bug 994297

Change-Id: Icbc0b3ca327d87754bac291b0d179faacdabc7aa
This commit is contained in:
Sam Morrison 2012-05-04 09:12:47 +10:00
parent 2698f2b350
commit a07df1700c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
horizon/dashboards/settings/ec2/forms.py
View File

@ -80,9 +80,13 @@ class DownloadX509Credentials(forms.SelfHandlingForm):
keys = find_or_create_access_keys(request, data.get('tenant'))
context = {'ec2_access_key': keys.access,
'ec2_secret_key': keys.secret,
'ec2_endpoint': api.url_for(request, 'ec2')}
'ec2_endpoint': api.url_for(request,
'ec2',
endpoint_type='publicURL')}
try:
s3_endpoint = api.url_for(request, 's3')
s3_endpoint = api.url_for(request,
's3',
endpoint_type='publicURL')
except exceptions.ServiceCatalogException:
s3_endpoint = None
context['s3_endpoint'] = s3_endpoint