fix dependencies v2

salt/agentdriver/init.sls

@@ -14,7 +14,12 @@ agentdriver:
       - libmemcached-dev
       - libmemcached-dev
       - zlib1g-dev
       - zlib1g-dev
     - require_in:
     - require_in:
-      - gitrepo: gitrepo_agentdriver
+      - git: gitrepo_agentdriver
       - virtualenv: virtualenv_agentdriver
       - virtualenv: virtualenv_agentdriver
   service:
   service:
     - running
     - running
+    - watch:
+      - pkg: agentdriver
+      - sls: agentdriver.gitrepo
+      - sls: agentdriver.virtualenv
+      - sls: agentdriver.configuration

salt/graphite/init.sls

@@ -15,6 +15,8 @@ graphite:
       - user: {{ pillar['graphite']['user'] }}
       - user: {{ pillar['graphite']['user'] }}
     - require_in:
     - require_in:
       - virtualenv: virtualenv_graphite
       - virtualenv: virtualenv_graphite
+      - service: graphite
+      - service: graphite-carbon
   user:
   user:
     - present
     - present
     - name: {{ pillar['graphite']['user'] }}
     - name: {{ pillar['graphite']['user'] }}

salt/storagedriver/init.sls

@@ -15,9 +15,14 @@ storagedriver:
       - zlib1g-dev
       - zlib1g-dev
       - qemu-utils
       - qemu-utils
     - require_in:
     - require_in:
-      - gitrepo: gitrepo_storagedriver
+      - git: gitrepo_storagedriver
       - virtualenv: virtualenv_storagedriver
       - virtualenv: virtualenv_storagedriver
 
 
 storage:
 storage:
   service:
   service:
     - running
     - running
+    - watch:
+      - pkg: storagedriver
+      - sls: storagedriver.gitrepo
+      - sls: storagedriver.virtualenv
+      - sls: storagedriver.configuration

salt/vncproxy/init.sls

 include:
 include:
-  - vncproxy.configuration
   - vncproxy.gitrepo
   - vncproxy.gitrepo
   - vncproxy.virtualenv
   - vncproxy.virtualenv
+  - vncproxy.configuration
 
 
 vncproxy:
 vncproxy:
   pkg.installed:
   pkg.installed:
@@ -14,7 +14,12 @@ vncproxy:
       - libffi-dev
       - libffi-dev
       - libssl-dev
       - libssl-dev
     - require_in:
     - require_in:
-      - gitrepo: gitrepo_vncproxy
-      - gitrepo: virtualenv_vncproxy
+      - git: gitrepo_vncproxy
+      - virtualenv: virtualenv_vncproxy
   service:
   service:
     - running
     - running
+    - watch:
+      - pkg: vncproxy
+      - sls: vncproxy.gitrepo
+      - sls: vncproxy.virtualenv
+      - sls: vncproxy.configuration