Fured fix

celeryconfig.py

 result_backend = 'amqp://'
 result_backend = 'amqp://'
 task_result_expires = 300
 task_result_expires = 300
 result_expires = 300
 result_expires = 300
-timezone = 'utc'
+timezone = 'UTC'
 enable_utc = True
 enable_utc = True
-accept_content = ['json', 'pickle_v2']
+accept_content = ['json', 'pickle_v2', 'pickle']
 task_serializer = 'json'
 task_serializer = 'json'
 result_serializer = 'pickle_v2'
 result_serializer = 'pickle_v2'
 task_store_errors_even_if_ignored = True
 task_store_errors_even_if_ignored = True

miscellaneous/netdriver.sudo

+Defaults: cloud !requiretty
+cloud   ALL = (ALL) NOPASSWD: /usr/bin/ovs-ofctl, /usr/bin/ovs-vsctl, /sbin/ip link set *
+

vmdriver.py

@@ -198,24 +198,31 @@ def create(vm_desc):
     return vm_xml_dump
     return vm_xml_dump
 
 
 
 
-class shutdown(AbortableTask):
+@celery.task(
+    name='vmdriver.shutdown',
+    bind=True,
+    base=AbortableTask,
+    time_limit=120,
+)
+@req_connection
+@wrap_libvirtError
+def shutdown(self, args):
     """ Shutdown virtual machine (need ACPI support).
     """ Shutdown virtual machine (need ACPI support).
     Return When domain is missiing.
     Return When domain is missiing.
     This job is abortable:
     This job is abortable:
         AbortableAsyncResult(id="<<jobid>>").abort()
         AbortableAsyncResult(id="<<jobid>>").abort()
     """
     """
-    time_limit = 120
-
-    @req_connection
-    def run(self, args):
     from time import sleep
     from time import sleep
     name, = args
     name, = args
     logger.info("Shutdown started for vm: %s", name)
     logger.info("Shutdown started for vm: %s", name)
     try:
     try:
+        # VM lookup
         domain = lookupByName(name)
         domain = lookupByName(name)
         logger.info("%s domain found in shutdown", name)
         logger.info("%s domain found in shutdown", name)
+        # ACPI shutdown
         domain.shutdown()
         domain.shutdown()
         logger.info("Domain shutdown called for vm: %s", name)
         logger.info("Domain shutdown called for vm: %s", name)
+        # Wait for disappearance
         while True:
         while True:
             try:
             try:
                 Connection.get().lookupByName(name)
                 Connection.get().lookupByName(name)
@@ -234,7 +241,6 @@ class shutdown(AbortableTask):
         new_e.libvirtError = True
         new_e.libvirtError = True
         raise new_e
         raise new_e
 
 
-
 @celery.task
 @celery.task
 @req_connection
 @req_connection
 @wrap_libvirtError
 @wrap_libvirtError