diff options
| author | drebs <drebs@riseup.net> | 2011-03-20 18:01:52 -0300 |
|---|---|---|
| committer | drebs <drebs@riseup.net> | 2011-03-20 18:01:52 -0300 |
| commit | 2a0c67462e0e8af3925b97e0e56d7899a0d05fba (patch) | |
| tree | 21567cef2d29daa8bdc2d79c7e3919f1f1c97a90 | |
| parent | 057cae3b20739cdcd9f1c4b219c18bf51fececa3 (diff) | |
| download | puppet-virtual-2a0c67462e0e8af3925b97e0e56d7899a0d05fba.tar.gz puppet-virtual-2a0c67462e0e8af3925b97e0e56d7899a0d05fba.tar.bz2 | |
preventing from bug in exec's timeout
| -rw-r--r-- | manifests/vserver.pp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/manifests/vserver.pp b/manifests/vserver.pp index 6955ab9..d0269a9 100644 --- a/manifests/vserver.pp +++ b/manifests/vserver.pp @@ -149,7 +149,9 @@ define vs_create($in_domain, $context, $legacy = false, $distro = 'etch', creates => "/etc/vservers/${vs_name}", require => File["/usr/local/bin/build_vserver","/etc/vservers/.defaults/vdirbase"], alias => "vs_create_${vs_name}", - timeout => "-1", + # TODO: change when this is fixed: http://projects.puppetlabs.com/issues/4769 + timeout => $lsbdistcodename ? { "squeeze" => '999999999999999999999999999999', + default => '-1', }, } } } |