From 84893bb54bc51777f4baf7064904565e83e12394 Mon Sep 17 00:00:00 2001 From: Nyíri Tamás Date: Mon, 22 Jun 2015 15:16:19 +0200 Subject: [PATCH] - changed graphite's django requirement to django 1.7 - every git.latest group removed --- pillar/installer.sls | 4 ++-- salt/agentdriver/gitrepo.sls | 1 - salt/fwdriver/gitrepo.sls | 1 - salt/graphite/files/requirements.txt | 2 +- salt/monitor-client/gitrepo.sls | 1 - salt/storagedriver/gitrepo.sls | 1 - salt/vmdriver/gitrepo.sls | 1 - salt/vncproxy/gitrepo.sls | 1 - 8 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pillar/installer.sls b/pillar/installer.sls index 09c4172..6d937e2 100644 --- a/pillar/installer.sls +++ b/pillar/installer.sls @@ -39,10 +39,10 @@ # directory: /datastore #storagedriver: -# queue_name: cloud +# queue_name: cloud-6605 #fwdriver: -# queue_name: cloud-1115 +# queue_name: cloud-6605 # gateway: 10.0.255.254 # external_net: 10.0.0.115/16 # external_if: eth0 diff --git a/salt/agentdriver/gitrepo.sls b/salt/agentdriver/gitrepo.sls index a7a3f29..8804504 100644 --- a/salt/agentdriver/gitrepo.sls +++ b/salt/agentdriver/gitrepo.sls @@ -7,6 +7,5 @@ gitrepo_agentdriver: - rev: {{ pillar['agentdriver']['repo_revision'] }} - target: /home/{{ pillar['user'] }}/agentdriver - user: {{ pillar['user'] }} - - group: {{ pillar['user'] }} - require: - pkg: git diff --git a/salt/fwdriver/gitrepo.sls b/salt/fwdriver/gitrepo.sls index 45abf70..a298657 100644 --- a/salt/fwdriver/gitrepo.sls +++ b/salt/fwdriver/gitrepo.sls @@ -7,6 +7,5 @@ gitrepo_fwdriver: - rev: {{ pillar['fwdriver']['repo_revision'] }} - target: /home/{{ pillar['fwdriver']['user'] }}/fwdriver - user: {{ pillar['fwdriver']['user'] }} - - group: {{ pillar['fwdriver']['user'] }} - require: - pkg: git diff --git a/salt/graphite/files/requirements.txt b/salt/graphite/files/requirements.txt index 1a45f0e..bb5693f 100644 --- a/salt/graphite/files/requirements.txt +++ b/salt/graphite/files/requirements.txt @@ -1,4 +1,4 @@ -Django==1.5 +Django==1.7 Twisted<12.0 python-memcached txAMQP diff --git a/salt/monitor-client/gitrepo.sls b/salt/monitor-client/gitrepo.sls index 6fa78d9..998b9f9 100644 --- a/salt/monitor-client/gitrepo.sls +++ b/salt/monitor-client/gitrepo.sls @@ -7,6 +7,5 @@ gitrepo_monitor-client: - rev: {{ pillar['monitor-client']['repo_revision'] }} - target: /home/{{ pillar['user'] }}/monitor-client - user: {{ pillar['user'] }} - - group: {{ pillar['user'] }} - require: - pkg: git diff --git a/salt/storagedriver/gitrepo.sls b/salt/storagedriver/gitrepo.sls index 45fb552..df0c4b4 100644 --- a/salt/storagedriver/gitrepo.sls +++ b/salt/storagedriver/gitrepo.sls @@ -7,6 +7,5 @@ gitrepo_storagedriver: - rev: {{ pillar['storagedriver']['repo_revision'] }} - target: /home/{{ pillar['user'] }}/storagedriver - user: {{ pillar['user'] }} - - group: {{ pillar['user'] }} - require: - pkg: git diff --git a/salt/vmdriver/gitrepo.sls b/salt/vmdriver/gitrepo.sls index 6333a1b..47f1a93 100644 --- a/salt/vmdriver/gitrepo.sls +++ b/salt/vmdriver/gitrepo.sls @@ -7,6 +7,5 @@ gitrepo_vmdriver: - rev: {{ pillar['vmdriver']['repo_revision'] }} - target: /home/{{ pillar['user'] }}/vmdriver - user: {{ pillar['user'] }} - - group: {{ pillar['user'] }} - require: - pkg: git diff --git a/salt/vncproxy/gitrepo.sls b/salt/vncproxy/gitrepo.sls index a4ad98d..a620212 100644 --- a/salt/vncproxy/gitrepo.sls +++ b/salt/vncproxy/gitrepo.sls @@ -7,6 +7,5 @@ gitrepo_vncproxy: - rev: {{ pillar['vncproxy']['repo_revision'] }} - target: /home/{{ pillar['user'] }}/vncproxy - user: {{ pillar['user'] }} - - group: {{ pillar['user'] }} - require: - pkg: git -- libgit2 0.26.0