summaryrefslogtreecommitdiff
path: root/puppet/modules/site_apt/manifests/dist_upgrade.pp
diff options
context:
space:
mode:
authorMicah <micah@leap.se>2016-05-10 14:48:26 -0400
committerMicah <micah@leap.se>2016-05-10 14:48:26 -0400
commit86c85582065c391aa13c0b9b397dfd1aa2e2ac7b (patch)
tree7c027409a517d862864bf3650f4a8a66f615162d /puppet/modules/site_apt/manifests/dist_upgrade.pp
parent70b1c648b94e6c007b9241a4661f33881e74485f (diff)
parent66b4c6b5ec6fe2f242020845fe92715ae2cdcc1e (diff)
Merge tag '0.8.0'
Release 0.8.0
Diffstat (limited to 'puppet/modules/site_apt/manifests/dist_upgrade.pp')
-rw-r--r--puppet/modules/site_apt/manifests/dist_upgrade.pp10
1 files changed, 5 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..0eb98cea 100644
--- a/puppet/modules/site_apt/manifests/dist_upgrade.pp
+++ b/puppet/modules/site_apt/manifests/dist_upgrade.pp
@@ -1,17 +1,17 @@
+# upgrade all packages
class site_apt::dist_upgrade {
+ # facter returns 'true' as string
+ # lint:ignore:quoted_booleans
if $::apt_running == 'true' {
+ # lint:endignore
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['apt_updated']
}
}
}