X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fupdate.pp;h=a9f2486b16bf87e9ad3f1f9143936a8ab45cdee3;hb=refs%2Fheads%2Frelease-prep;hp=4b05c21e069061c297bb79b1cbf8d8ecbce72a99;hpb=cef56276873b534415210abefd28454c321038c3;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/update.pp b/manifests/update.pp index 4b05c21..a9f2486 100644 --- a/manifests/update.pp +++ b/manifests/update.pp @@ -1,13 +1,16 @@ -# Defining apt update +# @summary Updates the list of available packages using apt-get update. +# +# @api private +# class apt::update { assert_private() - #TODO: to catch if $::apt_update_last_success has the value of -1 here. If we + #TODO: to catch if apt_update_last_success has the value of -1 here. If we #opt to do this, a info/warn would likely be all you'd need likely to happen #on the first run, but if it's not run in awhile something is likely borked #with apt and we'd want to know about it. - case $::apt::_update['frequency'] { + case $apt::_update['frequency'] { 'always': { $_kick_apt = true } @@ -15,8 +18,8 @@ class apt::update { #compare current date with the apt_update_last_success fact to determine #if we should kick apt_update. $daily_threshold = (Integer(Timestamp().strftime('%s')) - 86400) - if $::apt_update_last_success { - if $::apt_update_last_success + 0 < $daily_threshold { + if $facts['apt_update_last_success'] { + if $facts['apt_update_last_success'] + 0 < $daily_threshold { $_kick_apt = true } else { $_kick_apt = false @@ -30,8 +33,8 @@ class apt::update { #compare current date with the apt_update_last_success fact to determine #if we should kick apt_update. $weekly_threshold = (Integer(Timestamp().strftime('%s')) - 604800) - if $::apt_update_last_success { - if ( $::apt_update_last_success + 0 < $weekly_threshold ) { + if $facts['apt_update_last_success'] { + if $facts['apt_update_last_success'] + 0 < $weekly_threshold { $_kick_apt = true } else { $_kick_apt = false @@ -54,12 +57,12 @@ class apt::update { $_refresh = true } exec { 'apt_update': - command => "${::apt::provider} update", - loglevel => $::apt::_update['loglevel'], + command => "${apt::provider} update", + loglevel => $apt::_update['loglevel'], logoutput => 'on_failure', refreshonly => $_refresh, - timeout => $::apt::_update['timeout'], - tries => $::apt::_update['tries'], - try_sleep => 1 + timeout => $apt::_update['timeout'], + tries => $apt::_update['tries'], + try_sleep => 1, } }