From 4e68f3ebe2e5a0eb01bbeef437bf2157695c6118 Mon Sep 17 00:00:00 2001
From: Marcio Mazza <marciomazza@gmail.com>
Date: Tue, 9 Sep 2014 21:30:41 -0300
Subject: [PATCH] =?UTF-8?q?Puppet:=20python=20requirements=20separado=20pa?=
 =?UTF-8?q?ra=20for=C3=A7ar=20update?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 puppet/manifests/site.pp  | 24 +++++++++++++++++++-----
 requirements/producao.txt |  6 ++++--
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 1eaba09..b358ab3 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -9,7 +9,8 @@ user { 'sigi':
   require => Group['sigi']
 }
 
-package { [ 'git', 'tree', 'python-psycopg2', 'supervisor', 'memcached', ]: }
+package { [ 'git', 'python-psycopg2', 'supervisor', 'memcached',
+            ]: }
 
 $sigi_dir = '/srv/sigi'
 
@@ -63,10 +64,23 @@ file { ['/srv/.virtualenvs',]:
 }
 
 python::virtualenv { $sigi_venv_dir :
-  requirements => "${sigi_dir}/requirements/producao.txt",
-  require      => [ File['/srv/.virtualenvs'],
-                    Vcsrepo[$sigi_dir],
-                    Package[$python_ldap_deps] ]
+  require => File['/srv/.virtualenvs'],
+}
+
+python::requirements { "${sigi_dir}/requirements/producao.txt":
+  virtualenv  => $sigi_venv_dir,
+  forceupdate => true,
+  require     => [
+    Python::Virtualenv[$sigi_venv_dir],
+    Vcsrepo[$sigi_dir],
+    Package[$python_ldap_deps] ]
+}
+
+###########################################################################
+# GERALDO (reporting)
+file { "${sigi_venv_dir}/lib/python2.7/site-packages/reporting":
+  ensure => link,
+  target => "${sigi_venv_dir}/src/geraldo/reporting",
 }
 
 ###########################################################################
diff --git a/requirements/producao.txt b/requirements/producao.txt
index 54e3980..3c4d1bc 100644
--- a/requirements/producao.txt
+++ b/requirements/producao.txt
@@ -3,16 +3,18 @@ Pillow==2.5.3
 django-auth-ldap==1.2.1
 django-autoslug==1.7.2
 django-extensions==1.3.11
-git+git://github.com/jacobian/django-googlecharts.git@c542996cf9a7a097b447e1ce5a1a6b66bdad254f#egg=django_googlecharts-master
+git+git://github.com/jacobian/django-googlecharts.git@c542996cf9a7a097b447e1ce5a1a6b66bdad254f#egg=django_googlecharts
 django-localflavor==1.0
 django-treemenus==0.9.1
 eav-django==1.4.6
-git+git://github.com/marinho/geraldo.git@868ebdce67176d9b6205cddc92476f642c783fff#egg=Geraldo
 html5lib==0.999
 pisa==3.0.33
 reportlab==2.7
 six==1.7.3
 
+# eh importante usar -e pois precisamos do modulo reporting do fonte que nao eh instalado
+-e git://github.com/marinho/geraldo.git@868ebdce67176d9b6205cddc92476f642c783fff#egg=geraldo
+
 # Dependencias de producao
 gunicorn==18.0
 python-memcached==1.53