opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #483 from dannon/old_cloudlaunch_errormsg

Browse Source 
Catch and return error message during key verification in cloudlaunch.
This commit is contained in:
Nitesh Turaga
2015-07-22 12:36:12 -04:00
parent 08136a8b04 6049a74468
commit bcd1f74db1
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py
+11 -7
View File
@@ -60,13 +60,17 @@ class CloudController(BaseUIController):
"""
Get EC2 Account Info
"""
account_info = {}
cml = cloudman.launch.CloudManLauncher(key_id, secret)
ec2_conn = cml.connect_ec2(key_id, secret)
kps = ec2_conn.get_all_key_pairs()
account_info['clusters'] = cml.get_clusters_pd()
account_info['keypairs'] = [akp.name for akp in kps]
return dumps(account_info)
try:
account_info = {}
cml = cloudman.launch.CloudManLauncher(key_id, secret)
ec2_conn = cml.connect_ec2(key_id, secret)
kps = ec2_conn.get_all_key_pairs()
account_info['clusters'] = cml.get_clusters_pd()
account_info['keypairs'] = [akp.name for akp in kps]
return dumps(account_info)
except EC2ResponseError as e:
trans.response.status = 400
return e.message
@web.expose
def launch_instance(self, trans, cluster_name, password, key_id, secret,