Commit aa5c987d by Kálmán Viktor

Merge branch 'fix' into 'master'

fixes

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

See merge request !3
parents 57014336 84893bb5
...@@ -39,10 +39,10 @@ ...@@ -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
......
...@@ -7,6 +7,5 @@ gitrepo_agentdriver: ...@@ -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
...@@ -7,6 +7,5 @@ gitrepo_fwdriver: ...@@ -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
...@@ -7,6 +7,5 @@ gitrepo_monitor-client: ...@@ -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
...@@ -7,6 +7,5 @@ gitrepo_storagedriver: ...@@ -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
...@@ -7,6 +7,5 @@ gitrepo_vmdriver: ...@@ -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
...@@ -7,6 +7,5 @@ gitrepo_vncproxy: ...@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment