From 5825513bcd14efd39031ba5cab3613a39c3027ec Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 9 Dec 2015 17:06:59 +0100 Subject: [feat] Remove double run of apt-get update --- puppet/modules/site_apt/manifests/dist_upgrade.pp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'puppet/modules/site_apt') 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'] } } } -- cgit v1.2.3 From 3bb37824d5cf1e146a257d14d5cf41d7df3def5d Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 9 Dec 2015 17:13:23 +0100 Subject: [style] Lint site_apt::dist_upgrade --- puppet/modules/site_apt/manifests/dist_upgrade.pp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'puppet/modules/site_apt') diff --git a/puppet/modules/site_apt/manifests/dist_upgrade.pp b/puppet/modules/site_apt/manifests/dist_upgrade.pp index 250f4b70..40e2dd58 100644 --- a/puppet/modules/site_apt/manifests/dist_upgrade.pp +++ b/puppet/modules/site_apt/manifests/dist_upgrade.pp @@ -1,6 +1,10 @@ +# 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_dist_upgrade': -- cgit v1.2.3