summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-12-09 17:06:59 +0100
committervarac <varacanero@zeromail.org>2016-01-05 20:20:50 +0100
commit5825513bcd14efd39031ba5cab3613a39c3027ec (patch)
tree473a2842f813eb5425acac346fa9b12a115522ea /puppet
parentfe560e3769cb04c03de7ba2a2d40cb3040365156 (diff)
[feat] Remove double run of apt-get update
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_apt/manifests/dist_upgrade.pp6
1 files changed, 1 insertions, 5 deletions
diff --git a/puppet/modules/site_apt/manifests/dist_upgrade.pp b/puppet/modules/site_apt/manifests/dist_upgrade.pp
index 08de31bb..250f4b70 100644
--- a/puppet/modules/site_apt/manifests/dist_upgrade.pp
+++ b/puppet/modules/site_apt/manifests/dist_upgrade.pp
@@ -3,15 +3,11 @@ class site_apt::dist_upgrade {
if $::apt_running == 'true' {
fail ('apt-get is running in background - Please wait until it finishes. Exiting.')
} else {
- 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",
refreshonly => false,
timeout => 1200,
+ require => Exec['refresh_apt']
}
}
}