details: http://www.bx.psu.edu/hg/galaxy/rev/b636ff9d0f05 changeset: 3142:b636ff9d0f05 user: Enis Afgan <afgane@gmail.com> date: Thu Dec 03 14:16:50 2009 -0500 description: Added ability for a user to start 64bit cloud instances. diffstat: lib/galaxy/cloud/__init__.py | 1 + lib/galaxy/cloud/providers/ec2.py | 9 +++++---- templates/cloud/configure_cloud.mako | 5 +++++ 3 files changed, 11 insertions(+), 4 deletions(-) diffs (45 lines): diff -r 5e30e1ea6bbb -r b636ff9d0f05 lib/galaxy/cloud/__init__.py --- a/lib/galaxy/cloud/__init__.py Wed Dec 02 20:02:05 2009 -0500 +++ b/lib/galaxy/cloud/__init__.py Thu Dec 03 14:16:50 2009 -0500 @@ -397,6 +397,7 @@ return None store.error = error + store.status = store_status.ERROR self.sa_session.add( store ) self.sa_session.flush() diff -r 5e30e1ea6bbb -r b636ff9d0f05 lib/galaxy/cloud/providers/ec2.py --- a/lib/galaxy/cloud/providers/ec2.py Wed Dec 02 20:02:05 2009 -0500 +++ b/lib/galaxy/cloud/providers/ec2.py Thu Dec 03 14:16:50 2009 -0500 @@ -318,10 +318,11 @@ 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 ): """ diff -r 5e30e1ea6bbb -r b636ff9d0f05 templates/cloud/configure_cloud.mako --- a/templates/cloud/configure_cloud.mako Wed Dec 02 20:02:05 2009 -0500 +++ b/templates/cloud/configure_cloud.mako Thu Dec 03 14:16:50 2009 -0500 @@ -321,6 +321,11 @@ <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>