agentdriver, vmdriver: fix agentdriver service fail start

salt/agentdriver/init.sls

@@ -38,11 +38,4 @@ agentdriver:
     - require_in:
       - git: gitrepo_agentdriver
       - virtualenv: virtualenv_agentdriver
-  service:
-    - running
-    - enable: true
-    - watch:
-      - pkg: agentdriver
-      - sls: agentdriver.gitrepo
-      - sls: agentdriver.virtualenv
-      - sls: agentdriver.configuration
+

salt/allinone.sls

 include:
+  - agentdriver
   - manager
   - graphite
   - monitor-client
   - storagedriver
-  - agentdriver
   - vmdriver
   - vncproxy
   - fwdriver

salt/vmdriver/init.sls

@@ -52,6 +52,18 @@ vmdriver:
       - augeas: libvirtconf
       - git: gitrepo_vmdriver
       - virtualenv: virtualenv_vmdriver
+
+agentdriver_service:
+  service:
+    - name: agentdriver
+    - running
+    - enable: true
+    - watch:
+      - pkg: agentdriver
+      - sls: agentdriver.gitrepo
+      - sls: agentdriver.virtualenv
+      - sls: agentdriver.configuration
+
 node:
   service:
     - running