x/tuskar-ui
Code Issues Proposed changes

Merge "Return the correct ec2 access/secret when generating ec2rc.sh."

Browse Source
This commit is contained in:
Jenkins 2012-06-23 06:28:39 +00:00 committed by Gerrit Code Review
commit d46280f3b4
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,14 +61,12 @@ class DownloadX509Credentials(forms.SelfHandlingForm):
def handle(self, request, data): def handle(self, request, data):
def find_or_create_access_keys(request, tenant_id): def find_or_create_access_keys(request, tenant_id):
keys = api.keystone.list_ec2_credentials(request, request.user.id) keys = api.keystone.list_ec2_credentials(request, request.user.id)
if keys: for key in keys:
#TODO(jakedahn): Once real CRUD is created, we can allow user if key.tenant_id == tenant_id:
# to generate per access/secret pair. return key
return keys[0] return api.keystone.create_ec2_credentials(request,
else: request.user.id,
return api.keystone.create_ec2_credentials(request, tenant_id)
request.user.id,
tenant_id)
try: try:
# NOTE(jakedahn): Keystone errors unless we specifically scope # NOTE(jakedahn): Keystone errors unless we specifically scope
# the token to tenant before making the call. # the token to tenant before making the call.