Merge branch 'feature-extra-buttons'

circle/common/models.py

@@ -64,6 +64,7 @@ class ActivityModel(TimeStampedModel):
         if not self.finished:
         if not self.finished:
             self.finished = timezone.now()
             self.finished = timezone.now()
             self.succeeded = succeeded
             self.succeeded = succeeded
+            if result is not None:
                 self.result = result
                 self.result = result
             if event_handler is not None:
             if event_handler is not None:
                 event_handler(self)
                 event_handler(self)

circle/storage/models.py

@@ -150,7 +150,7 @@ class Disk(AclBase, TimeStampedModel):
         return {
         return {
             'source': self.path,
             'source': self.path,
             'driver_type': self.format,
             'driver_type': self.format,
-            'driver_cache': 'default',
+            'driver_cache': 'none',
             'target_device': self.device_type + self.dev_num,
             'target_device': self.device_type + self.dev_num,
             'disk_device': 'cdrom' if self.type == 'iso' else 'disk'
             'disk_device': 'cdrom' if self.type == 'iso' else 'disk'
         }
         }

circle/vm/models/instance.py

@@ -607,8 +607,9 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
         queue_name = self.get_remote_queue_name('vm')
         queue_name = self.get_remote_queue_name('vm')
 
 
         # Deploy VM on remote machine
         # Deploy VM on remote machine
-        with act.sub_activity('deploying_vm'):
-            vm_tasks.deploy.apply_async(args=[self.get_vm_desc()],
+        with act.sub_activity('deploying_vm') as deploy_act:
+            deploy_act.result = vm_tasks.deploy.apply_async(
+                args=[self.get_vm_desc()],
                 queue=queue_name).get(timeout=timeout)
                 queue=queue_name).get(timeout=timeout)
 
 
         # Estabilish network connection (vmdriver)
         # Estabilish network connection (vmdriver)
@@ -671,7 +672,7 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
         return local_tasks.deploy.apply_async(args=[self, user],
         return local_tasks.deploy.apply_async(args=[self, user],
                                               queue="localhost.man")
                                               queue="localhost.man")
 
 
-    def __destroy_vm(self, act, timeout):
+    def __destroy_vm(self, act, timeout=15):
         """Destroy the virtual machine and its associated networks.
         """Destroy the virtual machine and its associated networks.
 
 
         :param self: The virtual machine.
         :param self: The virtual machine.