fix dependencies

salt/agentdriver/gitrepo.sls

 git:
 git:
   pkg.installed
   pkg.installed
 
 
-gitrepo:
+gitrepo_agentdriver:
   git.latest:
   git.latest:
     - name: {{ pillar['agentdriver']['repo_name']  }} 
     - name: {{ pillar['agentdriver']['repo_name']  }} 
     - rev: {{ pillar['agentdriver']['repo_revision']  }}
     - rev: {{ pillar['agentdriver']['repo_revision']  }}

salt/agentdriver/init.sls

@@ -14,7 +14,7 @@ agentdriver:
       - libmemcached-dev
       - libmemcached-dev
       - zlib1g-dev
       - zlib1g-dev
     - require_in:
     - require_in:
-      - sls: gitrepo
-      - sls: virtualenv
+      - gitrepo: gitrepo_agentdriver
+      - virtualenv: virtualenv_agentdriver
   service:
   service:
     - running
     - running

salt/agentdriver/virtualenv.sls

-virtualenv:
+virtualenv_agentdriver:
   virtualenv.managed:
   virtualenv.managed:
     - name: /home/{{ pillar['user'] }}/.virtualenvs/agentdriver
     - name: /home/{{ pillar['user'] }}/.virtualenvs/agentdriver
     - requirements: /home/{{ pillar['user'] }}/agentdriver/requirements.txt
     - requirements: /home/{{ pillar['user'] }}/agentdriver/requirements.txt

salt/graphite/init.sls

@@ -14,7 +14,7 @@ graphite:
     - require:
     - require:
       - user: {{ pillar['graphite']['user'] }}
       - user: {{ pillar['graphite']['user'] }}
     - require_in:
     - require_in:
-      - sls: virtualenv
+      - virtualenv: virtualenv_graphite
   user:
   user:
     - present
     - present
     - name: {{ pillar['graphite']['user'] }}
     - name: {{ pillar['graphite']['user'] }}

salt/graphite/virtualenv.sls

-virtualenv:
+virtualenv_graphite:
   virtualenv.managed:
   virtualenv.managed:
     - name: /home/{{ pillar['graphite']['user'] }}/.virtualenvs/graphite
     - name: /home/{{ pillar['graphite']['user'] }}/.virtualenvs/graphite
     - requirements: /home/{{ pillar['graphite']['user'] }}/requirements.txt
     - requirements: /home/{{ pillar['graphite']['user'] }}/requirements.txt
@@ -12,12 +12,12 @@ global-site-packages:
   file.absent:
   file.absent:
     - name: /home/{{pillar['graphite']['user'] }}/.virtualenvs/graphite/lib/python2.7/no-global-site-packages.txt
     - name: /home/{{pillar['graphite']['user'] }}/.virtualenvs/graphite/lib/python2.7/no-global-site-packages.txt
     - require:
     - require:
-      - virtualenv: virtualenv
+      - virtualenv: virtualenv_graphite
 
 
 salt://graphite/files/syncdb.sh:
 salt://graphite/files/syncdb.sh:
   cmd.script:
   cmd.script:
     - template: jinja
     - template: jinja
     - user: {{ pillar['graphite']['user'] }}
     - user: {{ pillar['graphite']['user'] }}
     - require:
     - require:
-      - virtualenv: virtualenv
+      - virtualenv: virtualenv_graphite
       - user: {{ pillar['graphite']['user'] }}
       - user: {{ pillar['graphite']['user'] }}

salt/storagedriver/gitrepo.sls

 git:
 git:
   pkg.installed
   pkg.installed
 
 
-gitrepo:
+gitrepo_storagedriver:
   git.latest:
   git.latest:
     - name: {{ pillar['storagedriver']['repo_name']  }} 
     - name: {{ pillar['storagedriver']['repo_name']  }} 
     - rev: {{ pillar['storagedriver']['repo_revision']  }}
     - rev: {{ pillar['storagedriver']['repo_revision']  }}

salt/storagedriver/init.sls

@@ -14,8 +14,8 @@ storagedriver:
       - ntp
       - ntp
       - qemu-utils
       - qemu-utils
     - require_in:
     - require_in:
-      - sls: gitrepo
-      - sls: virtualenv
+      - gitrepo: gitrepo_storagedriver
+      - virtualenv: virtualenv_storagedriver
 
 
 storage:
 storage:
   service:
   service:

salt/storagedriver/virtualenv.sls

-virtualenv:
+virtualenv_storagedriver:
   virtualenv.managed:
   virtualenv.managed:
     - name: /home/{{ pillar['user'] }}/.virtualenvs/storagedriver
     - name: /home/{{ pillar['user'] }}/.virtualenvs/storagedriver
     - requirements: /home/{{ pillar['user'] }}/storagedriver/requirements/production.txt
     - requirements: /home/{{ pillar['user'] }}/storagedriver/requirements/production.txt

salt/vncproxy/gitrepo.sls

 git:
 git:
   pkg.installed
   pkg.installed
 
 
-gitrepo:
+gitrepo_vncproxy:
   git.latest:
   git.latest:
     - name: {{ pillar['vncproxy']['repo_name']  }} 
     - name: {{ pillar['vncproxy']['repo_name']  }} 
     - rev: {{ pillar['vncproxy']['repo_revision']  }}
     - rev: {{ pillar['vncproxy']['repo_revision']  }}

salt/vncproxy/init.sls

@@ -14,7 +14,7 @@ vncproxy:
       - libffi-dev
       - libffi-dev
       - libssl-dev
       - libssl-dev
     - require_in:
     - require_in:
-      - sls: gitrepo
-      - sls: virtualenv
+      - gitrepo: gitrepo_vncproxy
+      - gitrepo: virtualenv_vncproxy
   service:
   service:
     - running
     - running

salt/vncproxy/virtualenv.sls

-virtualenv:
+virtualenv_vncproxy:
   virtualenv.managed:
   virtualenv.managed:
     - name: /home/{{ pillar['user'] }}/.virtualenvs/vncproxy
     - name: /home/{{ pillar['user'] }}/.virtualenvs/vncproxy
     - requirements: /home/{{ pillar['user'] }}/vncproxy/requirements.txt
     - requirements: /home/{{ pillar['user'] }}/vncproxy/requirements.txt