From cf643df67d3cb69f1699459a906dc9b097d55a5e Mon Sep 17 00:00:00 2001
From: Enis Afgan <afgane@gmail.com>
Date: Thu, 3 Dec 2009 14:16:50 -0500
Subject: [PATCH] Added ability for a user to start 64bit cloud instances.

---
 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(-)

diff --git a/lib/galaxy/cloud/__init__.py b/lib/galaxy/cloud/__init__.py
index cd56a1ffa15..201949fdd49 100644
--- a/lib/galaxy/cloud/__init__.py
+++ b/lib/galaxy/cloud/__init__.py
@@ -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()
     
diff --git a/lib/galaxy/cloud/providers/ec2.py b/lib/galaxy/cloud/providers/ec2.py
index 2e67506ce94..165eb2e82c6 100644
--- a/lib/galaxy/cloud/providers/ec2.py
+++ b/lib/galaxy/cloud/providers/ec2.py
@@ -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 ):
         """
diff --git a/templates/cloud/configure_cloud.mako b/templates/cloud/configure_cloud.mako
index ef8a7d275c5..a37ac840f92 100644
--- a/templates/cloud/configure_cloud.mako
+++ b/templates/cloud/configure_cloud.mako
@@ -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>