opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-21 13:50:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added ability for a user to start 64bit cloud instances.

Browse Source
This commit is contained in:
Enis Afgan
2009-12-03 14:16:50 -05:00
parent 0e807f13f5
commit cf643df67d
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/cloud/__init__.py
+1
View File
@@ -397,6 +397,7 @@ class UCIwrapper( object ):
return None
store.error = error
store.status = store_status.ERROR
self.sa_session.add( store )
self.sa_session.flush()
lib/galaxy/cloud/providers/ec2.py
+5 -4
View File
@@ -318,10 +318,11 @@ class EC2CloudProvider( object ):
if count == len( vl ):
uci_wrapper.set_deleted()
else:
err = "Deleting following volume(s) failed: " + str( failedList ) + ". However, these volumes were successfully deleted: " \
+ str( deletedList ) + ". MANUAL intervention and processing needed."
log.error( err )
uci_wrapper.set_error( err, True )
if uci_wrapper.get_uci_state != uci_states.ERROR:
err = "Deleting following volume(s) failed: " + str( failedList ) + ". However, these volumes were successfully deleted: " \
+ str( deletedList ) + ". MANUAL intervention and processing needed."
log.error( err )
uci_wrapper.set_error( err, True )
def snapshot_uci( self, uci_wrapper ):
"""
templates/cloud/configure_cloud.mako
+5
View File
@@ -321,6 +321,11 @@ function trim19(str){
<a class="action-button" href="${h.url_for( action='rename_uci', id=trans.security.encode_id(prevInstance.id) )}">Rename</a>
<a class="action-button" href="${h.url_for( action='start', id=trans.security.encode_id(prevInstance.id), type='m1.small' )}"> Start m1.small</a>
<a class="action-button" href="${h.url_for( action='start', id=trans.security.encode_id(prevInstance.id), type='c1.medium' )}"> Start c1.medium</a>
<a class="action-button" href="${h.url_for( action='start', id=trans.security.encode_id(prevInstance.id), type='m1.large' )}"> Start m1.large</a>
<a class="action-button" href="${h.url_for( action='start', id=trans.security.encode_id(prevInstance.id), type='m1.xlarge' )}"> Start m1.xlarge</a>
<a class="action-button" href="${h.url_for( action='start', id=trans.security.encode_id(prevInstance.id), type='c1.xlarge' )}"> Start c1.xlarge</a>
<a class="action-button" href="${h.url_for( action='start', id=trans.security.encode_id(prevInstance.id), type='m2.2xlarge' )}"> Start m2.2xlarge</a>
<a class="action-button" href="${h.url_for( action='start', id=trans.security.encode_id(prevInstance.id), type='m2.4xlarge' )}"> Start m2.4xlarge</a>
<a class="action-button" href="${h.url_for( action='create_snapshot', id=trans.security.encode_id(prevInstance.id) )}">Create snapshot</a>
<a class="action-button" href="${h.url_for( action='view_snapshots', id=trans.security.encode_id(prevInstance.id) )}">View snapshots</a>
<a class="action-button" confirm="Are you sure you want to delete instance '${prevInstance.name}'? This will delete all of your data assocaiated with this instance!" href="${h.url_for( action='delete_uci', id=trans.security.encode_id(prevInstance.id) )}">Delete</a>