apt::source: Merge `include_*` options into hash.

[puppet-modules/puppetlabs-apt.git] / manifests / update.pp

diff --git a/manifests/update.pp b/manifests/update.pp
index 9112c9b62668963187a8de7e619d62525199d9d7..a19e90aacd091c423da07e2776a11c0eec70cfe1 100644 (file)
--- a/manifests/update.pp
+++ b/manifests/update.pp
@@ -1,14 +1,13 @@
 class apt::update {
-  include apt::params
   #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.
 
-  if $::apt::always_apt_update == false {
+  if $::apt::_update['always'] == false {
     #if always_apt_update is true there's no point in parsing this logic.
 
-    case $apt::apt_update_frequency {
+    case $::apt::_update['frequency'] {
       'always': {
         $_kick_apt = true
       }
@@ -19,6 +18,8 @@ class apt::update {
         if $::apt_update_last_success {
           if $::apt_update_last_success < $daily_threshold {
             $_kick_apt = true
+          } else {
+            $_kick_apt = false
           }
         } else {
           #if apt-get update has not successfully run, we should kick apt_update
@@ -32,6 +33,8 @@ class apt::update {
         if $::apt_update_last_success {
           if ( $::apt_update_last_success < $weekly_threshold ) {
             $_kick_apt = true
+          } else {
+            $_kick_apt = false
           }
         } else {
           #if apt-get update has not successfully run, we should kick apt_update
@@ -41,20 +44,24 @@ class apt::update {
       default: {
         #catches 'recluctantly', and any other value (which should not occur).
         #do nothing.
+        $_kick_apt = false
       }
     }
+  } else {
+    $_kick_apt = false
   }
+
   if $_kick_apt {
     $_refresh = false
   } else {
     $_refresh = true
   }
   exec { 'apt_update':
-    command     => "${apt::params::provider} update",
+    command     => "${::apt::provider} update",
     logoutput   => 'on_failure',
     refreshonly => $_refresh,
-    timeout     => $apt::update_timeout,
-    tries       => $apt::update_tries,
+    timeout     => $::apt::_update['timeout'],
+    tries       => $::apt::_update['tries'],
     try_sleep   => 1
   }
 }