Added environment parameter to requirements and virtualenv classes and incremented version to 1.1.3

fgimian · fgimian · commit d3d69488a9a9 · 2013-06-04T12:01:36.000+10:00
diff --git a/Modulefile b/Modulefile
@@ -1,5 +1,5 @@
 name         'puppet-python'
-version      '1.1.2'
+version      '1.1.3'
 
 author       'Sergey Stankevich'
 license      'Apache License, Version 2.0'
diff --git a/manifests/requirements.pp b/manifests/requirements.pp
@@ -10,15 +10,18 @@
 # [*virtualenv*]
 #  virtualenv to run pip in. Default: system-wide
 #
-# [*proxy*]
-#  Proxy server to use for outbound connections. Default: none
-#
 # [*owner*]
 #  The owner of the virtualenv being manipulated. Default: root
 #
 # [*group*]
 #  The group relating to the virtualenv being manipulated. Default: root
 #
+# [*proxy*]
+#  Proxy server to use for outbound connections. Default: none
+#
+# [*environment*]
+#  Additional environment variables required to install the packages. Default: none
+#
 # === Examples
 #
 # python::requirements { '/var/www/project1/requirements.txt':
@@ -35,9 +38,10 @@
 define python::requirements (
   $requirements = $name,
   $virtualenv   = 'system',
-  $proxy        = false,
   $owner        = 'root',
-  $group        = 'root'
+  $group        = 'root',
+  $proxy        = false,
+  $environment = []
 ) {
 
   if $virtualenv == 'system' and ($owner != 'root' or $group != 'root') {
@@ -80,6 +84,7 @@
     timeout     => 1800,
     user        => $owner,
     subscribe   => File[$requirements],
+    environment => $environment,
   }
 
 }
diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp
@@ -13,23 +13,26 @@
 # [*requirements*]
 #  Path to pip requirements.txt file. Default: none
 #
-# [*proxy*]
-#  Proxy server to use for outbound connections. Default: none
-#
 # [*systempkgs*]
 #  Copy system site-packages into virtualenv. Default: don't
 #
 # [*distribute*]
 #  Include distribute in the virtualenv. Default: true
 #
+# [*index*]
+#  Base URL of Python package index. Default: none (http://pypi.python.org/simple/)
+#
 # [*owner*]
 #  The owner of the virtualenv being manipulated. Default: root
 #
 # [*group*]
 #  The group relating to the virtualenv being manipulated. Default: root
 #
-# [*index*]
-#  Base URL of Python package index. Default: none (http://pypi.python.org/simple/)
+# [*proxy*]
+#  Proxy server to use for outbound connections. Default: none
+#
+# [*environment*]
+#  Additional environment variables required to install the packages. Default: none
 #
 # === Examples
 #
@@ -53,12 +56,13 @@
   $ensure       = present,
   $version      = 'system',
   $requirements = false,
-  $proxy        = false,
   $systempkgs   = false,
   $distribute   = true,
+  $index        = false,
   $owner        = 'root',
   $group        = 'root',
-  $index        = false,
+  $proxy        = false,
+  $environment = []
 ) {
 
   $venv_dir = $name
@@ -100,6 +104,7 @@
       creates => "${venv_dir}/bin/activate",
       path    => [ '/bin', '/usr/bin', '/usr/sbin' ],
       cwd     => "/tmp",
+      environment => $environment,
     }
 
     if $requirements {
@@ -109,6 +114,7 @@
         timeout     => 1800,
         user        => $owner,
         subscribe   => Exec["python_virtualenv_${venv_dir}"],
+        environment => $environment,
       }
 
       python::requirements { "${requirements}_${venv_dir}":
