Added timeout parameter to python::requirements

Diogo de Campos · Diogo de Campos · commit 3fd7d9fe8c63 · 2015-03-26T09:48:36.000-03:00
diff --git a/manifests/requirements.pp b/manifests/requirements.pp
@@ -44,6 +44,9 @@
 # [*log_dir*]
 # String. Log directory.
 #
+# [*timeout*]
+#  The maximum time in seconds the "pip install" command should take. Default: 1800
+#
 # === Examples
 #
 # python::requirements { '/var/www/project1/requirements.txt':
@@ -70,6 +73,7 @@
   $extra_pip_args         = '',
   $fix_requirements_owner = true,
   $log_dir                = '/tmp',
+  $timeout                = 1800,
 ) {
 
   if $virtualenv == 'system' and ($owner != 'root' or $group != 'root') {
@@ -122,7 +126,7 @@
     provider    => shell,
     command     => "${pip_env} --log ${log}/pip.log install ${proxy_flag} ${src_flag} -r ${requirements} ${extra_pip_args}",
     refreshonly => !$forceupdate,
-    timeout     => 1800,
+    timeout     => $timeout,
     cwd         => $cwd,
     user        => $owner,
     subscribe   => File[$requirements],
diff --git a/tests/requirements.pp b/tests/requirements.pp
@@ -12,4 +12,5 @@
 python::requirements { '/var/www/project1/requirements.txt':
   virtualenv => 'system',
   proxy      => 'http://proxy.domain.com:3128',
+  timeout    => 2400,
 }

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,5 @@`
`12`	`12`	`python::requirements { '/var/www/project1/requirements.txt':`
`13`	`13`	`virtualenv => 'system',`
`14`	`14`	`proxy => 'http://proxy.domain.com:3128',`
	`15`	`+ timeout => 2400,`
`15`	`16`	`}`