summaryrefslogtreecommitdiff
path: root/manifests/requirements.pp
diff options
context:
space:
mode:
authorFotis Gimian <fgimiansoftware@gmail.com>2013-06-04 11:55:04 +1000
committerFotis Gimian <fgimiansoftware@gmail.com>2013-06-04 12:01:36 +1000
commitd3d69488a9a9f2bf2edd170ea6db31830690e8d9 (patch)
tree188f90656113d9502b0a511618d000183a2fc752 /manifests/requirements.pp
parenta6d9f59d0bd9c27e1fd9668b926913c44dfb52e6 (diff)
Added environment parameter to requirements and virtualenv classes and incremented version to 1.1.3
Diffstat (limited to 'manifests/requirements.pp')
-rw-r--r--manifests/requirements.pp15
1 files changed, 10 insertions, 5 deletions
diff --git a/manifests/requirements.pp b/manifests/requirements.pp
index ba16d1e..67906fc 100644
--- 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 @@ define python::requirements (
timeout => 1800,
user => $owner,
subscribe => File[$requirements],
+ environment => $environment,
}
}