Bach Dániel · @bachdaniel · Őry Máté · Őry Máté · Bach Dániel · 492a0407
--- a/circle/vm/tasks/local_agent_tasks.py
+++ b/circle/vm/tasks/local_agent_tasks.py
+    with act.sub_activity('change_password'):
+        change_password.apply_async(queue=queue, args=(vm, instance.pw))
+    with act.sub_activity('set_time'):
+        set_time.apply_async(queue=queue, args=(vm, time.time()))
+    with act.sub_activity('set_hostname'):
+        set_hostname.apply_async(
+            queue=queue, args=(vm, instance.primary_host.hostname))
+
+
 @celery.task
 def agent_started(vm):
-    from vm.models import Instance, instance_activity
+    from vm.models import Instance, instance_activity, InstanceActivity
    instance = Instance.objects.get(id=int(vm.split('-')[-1]))
+    initialized = InstanceActivity.objects.filter(
+        instance=instance, activity_code='vm.Instance.agent').count()
--- a/circle/vm/tasks/local_agent_tasks.py
+++ b/circle/vm/tasks/local_agent_tasks.py
    with instance_activity(code_suffix='agent', instance=instance) as act:
        with act.sub_activity('starting'):
-            queue = "%s.agent" % instance.node.host.hostname
-            print queue
-            restart_networking.apply_async(queue=queue,
-                                           args=(vm, ))
-            change_password.apply_async(queue=queue,
-                                        args=(vm, instance.pw))
-            set_time.apply_async(queue=queue,
-                                 args=(vm, time.time()))
-            set_hostname.apply_async(queue=queue,
-                                     args=(vm, instance.primary_host.hostname))
+            pass
+        if not initialized:
+            send_init_commands(instance, act, vm)
+        with act.sub_activity('start_ssh'):