[puppet] Added distribute and pip and modified venv upgrading options

puppet/nailgun/manifests/venv.pp

@@ -21,6 +21,7 @@ class nailgun::venv(
     venv => $venv,
     opts => $venv_opts,
     require => Package["python-virtualenv"],
+    pip_opts => $pip_opts,
   }
 
   nailgun::venv::pip { "$venv_$package":

puppet/nailgun/manifests/venv/venv.pp

@@ -4,6 +4,7 @@ define nailgun::venv::venv(
   $owner = undef,
   $group = undef,
   $ensure = "present",
+  $pip_opts = "",
   ) {
 
 
@@ -32,8 +33,9 @@ define nailgun::venv::venv(
     }
 
     exec { "update distribute and pip in $venv":
-      command => "$venv/bin/pip install -U distribute pip",
+      command => "$venv/bin/pip install ${pip_opts} -U distribute pip",
       refreshonly => true,
+      returns => [0, 1],
     }
 
     }

requirements-eggs.txt

@@ -1,16 +1,18 @@
+Paste	1.7.5.1
+PyYAML	3.10
+SQLAlchemy	0.7.8
 amqplib	1.0.2
 anyjson	0.3.1
 argparse	1.2.1
-Paste	1.7.5.1
+distribute 0.6.30
 eventlet	0.9.17
 greenlet	0.4.0
 kombu	2.1.8
+netaddr	0.7.10
 nose	1.1.2
 nose2	0.4.1
-netaddr	0.7.10
+pip 1.2.1
 pycrypto	2.6
-PyYAML	3.10
-SQLAlchemy	0.7.8
 simplejson	2.6.2
 web.py	0.37
 wsgilog	0.3