summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-03-07 16:36:54 +0100
committervarac <varacanero@zeromail.org>2013-03-07 16:36:54 +0100
commit77c8025aebe3a7b83fc128be6e0abe511f9f0888 (patch)
tree707d315ecf6e6f9f62a0c6c32adc6347e38dc188 /puppet
parent97a17c393f454a32f601db5b6522dd425f325ff3 (diff)
increase Exec timeout for dist_upgrade
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_apt/manifests/dist_upgrade.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/puppet/modules/site_apt/manifests/dist_upgrade.pp b/puppet/modules/site_apt/manifests/dist_upgrade.pp
index f8ea05fc..91301efd 100644
--- a/puppet/modules/site_apt/manifests/dist_upgrade.pp
+++ b/puppet/modules/site_apt/manifests/dist_upgrade.pp
@@ -1,6 +1,6 @@
class site_apt::dist_upgrade {
- if $::apt_running == 'true' {
+ if $::apt_running == 'true' {
fail ('apt-get is running in background - Please wait until it finishes. Exiting.')
} else {
exec{'initial_apt_update':
@@ -10,6 +10,7 @@ class site_apt::dist_upgrade {
exec{'initial_apt_dist_upgrade':
command => "/usr/bin/apt-get -q -y -o 'DPkg::Options::=--force-confold' dist-upgrade",
refreshonly => false,
+ timeout => 1200,
}
}
}