summaryrefslogtreecommitdiff
path: root/puppet/modules/site_apt/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-03-12 14:33:24 +0100
committervarac <varacanero@zeromail.org>2013-03-12 14:33:24 +0100
commit3633f137c99a4fcb647cb098ee01704ff3f7554c (patch)
tree7e7a2334149f12f42725b4d9a549034a18142b8b /puppet/modules/site_apt/manifests
parent0ffc583488ee044be30ea5bf7fae751505419a9b (diff)
parent01941d905a71a2088ec080703f4e5430dec7a2ec (diff)
Merge branch 'feature/bigcouch' into develop
Conflicts: provider_base/services/couchdb.json
Diffstat (limited to 'puppet/modules/site_apt/manifests')
-rw-r--r--puppet/modules/site_apt/manifests/dist_upgrade.pp1
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/modules/site_apt/manifests/dist_upgrade.pp b/puppet/modules/site_apt/manifests/dist_upgrade.pp
index 91301efd..08de31bb 100644
--- a/puppet/modules/site_apt/manifests/dist_upgrade.pp
+++ b/puppet/modules/site_apt/manifests/dist_upgrade.pp
@@ -6,6 +6,7 @@ class site_apt::dist_upgrade {
exec{'initial_apt_update':
command => '/usr/bin/apt-get update',
refreshonly => false,
+ timeout => 360,
}
exec{'initial_apt_dist_upgrade':
command => "/usr/bin/apt-get -q -y -o 'DPkg::Options::=--force-confold' dist-upgrade",