Make pip install distribute in a virtualenv optional

pip install distribute currentlyfails on Python 3, this way people can
skip installing it. It's included by default to remain backward-
compatible

2 files changed, 13 insertions, 1 deletions

diff --git a/README.md b/README.md
index 6289fdb..816610d 100644
--- a/README.md
+++ b/README.md
@@ -66,12 +66,15 @@ Creates Python virtualenv.
 
 **systempkgs** — Copy system site-packages into virtualenv. Default: don't
 
+**distribute** — Include distribute in the virtualenv. Default: true
+
 	python::virtualenv { '/var/www/project1':
 	  ensure       => present,
 	  version      => 'system',
 	  requirements => '/var/www/project1/requirements.txt',
 	  proxy        => 'http://proxy.domain.com:3128',
 	  systempkgs   => true,
+	  distribute   => false,
 	}
 
 ### python::gunicorn
diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp
index e816468..c2595e2 100644
--- a/manifests/virtualenv.pp
+++ b/manifests/virtualenv.pp
@@ -19,6 +19,9 @@
 # [*systempkgs*]
 #  Copy system site-packages into virtualenv. Default: don't
 #
+# [*distribute*]
+#  Include distribute in the virtualenv. Default: true
+#
 # === Examples
 #
 # python::virtualenv { '/var/www/project1':
@@ -41,6 +44,7 @@ define python::virtualenv (
   $requirements = false,
   $proxy        = false,
   $systempkgs   = false,
+  $distribute   = true,
 ) {
 
   $venv_dir = $name
@@ -67,11 +71,16 @@ define python::virtualenv (
       default  => '--system-site-packages',
     }
 
+    $distribute_pkg = $distribute ? {
+      true     => 'distribute',
+      default  => '',
+    }
+
     exec { "python_virtualenv_${venv_dir}":
       command => "mkdir -p ${venv_dir} \
         ${proxy_command} \
         && virtualenv -p `which ${python}` ${system_pkgs_flag} ${venv_dir} \
-        && ${venv_dir}/bin/pip install ${proxy_flag} --upgrade distribute pip",
+        && ${venv_dir}/bin/pip install ${proxy_flag} --upgrade ${distribute_pkg} pip",
       creates => $venv_dir,
     }