Merge branch 'fix' into 'master'

fixes

- changed graphite's django requirement to django 1.7
- every git.latest group removed

See merge request !3

pillar/installer.sls

@@ -39,10 +39,10 @@
 #  directory: /datastore
 #  directory: /datastore
 
 
 #storagedriver:
 #storagedriver:
-#  queue_name: cloud
+#  queue_name: cloud-6605
 
 
 #fwdriver:
 #fwdriver:
-#  queue_name: cloud-1115
+#  queue_name: cloud-6605
 #  gateway: 10.0.255.254
 #  gateway: 10.0.255.254
 #  external_net: 10.0.0.115/16
 #  external_net: 10.0.0.115/16
 #  external_if: eth0
 #  external_if: eth0

salt/agentdriver/gitrepo.sls

@@ -7,6 +7,5 @@ gitrepo_agentdriver:
     - rev: {{ pillar['agentdriver']['repo_revision'] }}
     - rev: {{ pillar['agentdriver']['repo_revision'] }}
     - target: /home/{{ pillar['user'] }}/agentdriver
     - target: /home/{{ pillar['user'] }}/agentdriver
     - user: {{ pillar['user'] }}
     - user: {{ pillar['user'] }}
-    - group: {{ pillar['user'] }}
     - require:
     - require:
       - pkg: git
       - pkg: git

salt/fwdriver/gitrepo.sls

@@ -7,6 +7,5 @@ gitrepo_fwdriver:
     - rev: {{ pillar['fwdriver']['repo_revision'] }}
     - rev: {{ pillar['fwdriver']['repo_revision'] }}
     - target: /home/{{ pillar['fwdriver']['user'] }}/fwdriver
     - target: /home/{{ pillar['fwdriver']['user'] }}/fwdriver
     - user: {{ pillar['fwdriver']['user'] }}
     - user: {{ pillar['fwdriver']['user'] }}
-    - group: {{ pillar['fwdriver']['user'] }}
     - require:
     - require:
       - pkg: git
       - pkg: git

salt/graphite/files/requirements.txt

-Django==1.5
+Django==1.7
 Twisted<12.0
 Twisted<12.0
 python-memcached
 python-memcached
 txAMQP
 txAMQP

salt/monitor-client/gitrepo.sls

@@ -7,6 +7,5 @@ gitrepo_monitor-client:
     - rev: {{ pillar['monitor-client']['repo_revision'] }}
     - rev: {{ pillar['monitor-client']['repo_revision'] }}
     - target: /home/{{ pillar['user'] }}/monitor-client
     - target: /home/{{ pillar['user'] }}/monitor-client
     - user: {{ pillar['user'] }}
     - user: {{ pillar['user'] }}
-    - group: {{ pillar['user'] }}
     - require:
     - require:
       - pkg: git
       - pkg: git

salt/storagedriver/gitrepo.sls

@@ -7,6 +7,5 @@ gitrepo_storagedriver:
     - rev: {{ pillar['storagedriver']['repo_revision'] }}
     - rev: {{ pillar['storagedriver']['repo_revision'] }}
     - target: /home/{{ pillar['user'] }}/storagedriver
     - target: /home/{{ pillar['user'] }}/storagedriver
     - user: {{ pillar['user'] }}
     - user: {{ pillar['user'] }}
-    - group: {{ pillar['user'] }}
     - require:
     - require:
       - pkg: git
       - pkg: git

salt/vmdriver/gitrepo.sls

@@ -7,6 +7,5 @@ gitrepo_vmdriver:
     - rev: {{ pillar['vmdriver']['repo_revision'] }}
     - rev: {{ pillar['vmdriver']['repo_revision'] }}
     - target: /home/{{ pillar['user'] }}/vmdriver
     - target: /home/{{ pillar['user'] }}/vmdriver
     - user: {{ pillar['user'] }}
     - user: {{ pillar['user'] }}
-    - group: {{ pillar['user'] }}
     - require:
     - require:
       - pkg: git
       - pkg: git

salt/vncproxy/gitrepo.sls

@@ -7,6 +7,5 @@ gitrepo_vncproxy:
     - rev: {{ pillar['vncproxy']['repo_revision'] }}
     - rev: {{ pillar['vncproxy']['repo_revision'] }}
     - target: /home/{{ pillar['user'] }}/vncproxy
     - target: /home/{{ pillar['user'] }}/vncproxy
     - user: {{ pillar['user'] }}
     - user: {{ pillar['user'] }}
-    - group: {{ pillar['user'] }}
     - require:
     - require:
       - pkg: git
       - pkg: git